| 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 | 7 TEST_EXECUTABLE = build/out/Debug/tests | 
| 8 | 8 | 
| 9 .PHONY: all test clean v8_android android | 9 .PHONY: all test clean v8_android android docs | 
| 10 | 10 | 
| 11 all: | 11 all: | 
| 12         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 | 
| 13         $(MAKE) -C build | 13         $(MAKE) -C build | 
| 14 | 14 | 
| 15 test: all | 15 test: all | 
| 16 ifdef FILTER | 16 ifdef FILTER | 
| 17         $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) | 17         $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) | 
| 18 else | 18 else | 
| 19         $(TEST_EXECUTABLE) | 19         $(TEST_EXECUTABLE) | 
| 20 endif | 20 endif | 
| 21 | 21 | 
|  | 22 docs: | 
|  | 23         doxygen | 
|  | 24 | 
| 22 clean: | 25 clean: | 
| 23 »       $(RM) -r build | 26 »       $(RM) -r build docs | 
| 24 | 27 | 
| 25 v8_android: | 28 v8_android: | 
| 26         mkdir -p third_party/v8/build/gyp | 29         mkdir -p third_party/v8/build/gyp | 
| 27         cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp | 30         cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp | 
| 28         DEFINES="${ANDROID_PARAMETERS}" \ | 31         DEFINES="${ANDROID_PARAMETERS}" \ | 
| 29         OUTDIR=../../build \ | 32         OUTDIR=../../build \ | 
| 30         $(MAKE) -C third_party/v8 android_arm.release | 33         $(MAKE) -C third_party/v8 android_arm.release | 
| 31 | 34 | 
| 32 android: v8_android | 35 android: v8_android | 
| 33         GYP_DEFINES="${ANDROID_PARAMETERS}" \ | 36         GYP_DEFINES="${ANDROID_PARAMETERS}" \ | 
| 34         third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator
    -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp | 37         third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator
    -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp | 
| 35         ndk-build -C build installed_modules \ | 38         ndk-build -C build installed_modules \ | 
| 36         BUILDTYPE=Release \ | 39         BUILDTYPE=Release \ | 
| 37         APP_PLATFORM=android-9 \ | 40         APP_PLATFORM=android-9 \ | 
| 38         APP_STL=gnustl_static \ | 41         APP_STL=gnustl_static \ | 
| 39         APP_BUILD_SCRIPT=Makefile \ | 42         APP_BUILD_SCRIPT=Makefile \ | 
| 40         NDK_PROJECT_PATH=. \ | 43         NDK_PROJECT_PATH=. \ | 
| 41         NDK_OUT=. \ | 44         NDK_OUT=. \ | 
| 42         NDK_APP_DST_DIR=android_arm.release | 45         NDK_APP_DST_DIR=android_arm.release | 
| OLD | NEW | 
|---|