| OLD | NEW |
| 1 ARCH := x64 | 1 ARCH := x64 |
| 2 | 2 |
| 3 ANDROID_PARAMETERS = target_arch=arm OS=android | 3 ANDROID_PARAMETERS = target_arch=arm OS=android |
| 4 ANDROID_PARAMETERS += android_target_arch=arm | 4 ANDROID_PARAMETERS += android_target_arch=arm |
| 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off | 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off |
| 6 | 6 |
| 7 TEST_EXECUTABLE = build/out/Debug/tests |
| 8 |
| 7 .PHONY: all test clean v8_android android | 9 .PHONY: all test clean v8_android android |
| 8 | 10 |
| 9 all: | 11 all: |
| 10 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=
build -Dtarget_arch=$(ARCH) libadblockplus.gyp | 12 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=
build -Dtarget_arch=$(ARCH) libadblockplus.gyp |
| 11 $(MAKE) -C build | 13 $(MAKE) -C build |
| 12 | 14 |
| 13 test: all | 15 test: all |
| 14 » build/out/Debug/tests | 16 ifdef FILTER |
| 17 » $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) |
| 18 else |
| 19 » $(TEST_EXECUTABLE) |
| 20 endif |
| 15 | 21 |
| 16 clean: | 22 clean: |
| 17 $(RM) -r build | 23 $(RM) -r build |
| 18 | 24 |
| 19 v8_android: | 25 v8_android: |
| 20 mkdir -p third_party/v8/build/gyp | 26 mkdir -p third_party/v8/build/gyp |
| 21 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp | 27 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp |
| 22 DEFINES="${ANDROID_PARAMETERS}" \ | 28 DEFINES="${ANDROID_PARAMETERS}" \ |
| 23 OUTDIR=../../build \ | 29 OUTDIR=../../build \ |
| 24 $(MAKE) -C third_party/v8 android_arm.release | 30 $(MAKE) -C third_party/v8 android_arm.release |
| 25 | 31 |
| 26 android: v8_android | 32 android: v8_android |
| 27 GYP_DEFINES="${ANDROID_PARAMETERS}" \ | 33 GYP_DEFINES="${ANDROID_PARAMETERS}" \ |
| 28 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=
build -Gandroid_ndk_version=r9 libadblockplus.gyp | 34 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=
build -Gandroid_ndk_version=r9 libadblockplus.gyp |
| 29 ndk-build -C build installed_modules \ | 35 ndk-build -C build installed_modules \ |
| 30 BUILDTYPE=Release \ | 36 BUILDTYPE=Release \ |
| 31 APP_PLATFORM=android-9 \ | 37 APP_PLATFORM=android-9 \ |
| 32 APP_STL=gnustl_static \ | 38 APP_STL=gnustl_static \ |
| 33 APP_BUILD_SCRIPT=Makefile \ | 39 APP_BUILD_SCRIPT=Makefile \ |
| 34 NDK_PROJECT_PATH=. \ | 40 NDK_PROJECT_PATH=. \ |
| 35 NDK_OUT=. \ | 41 NDK_OUT=. \ |
| 36 NDK_APP_DST_DIR=android_arm.release | 42 NDK_APP_DST_DIR=android_arm.release |
| OLD | NEW |