OLD | NEW |
1 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py) | 1 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py) |
2 | 2 |
3 ifndef HOST_OS | 3 ifndef HOST_OS |
4 raw_OS = $(shell uname -s) | 4 raw_OS = $(shell uname -s) |
5 ifeq (${raw_OS},Linux) | 5 ifeq (${raw_OS},Linux) |
6 HOST_OS=linux | 6 HOST_OS=linux |
7 TRAVIS_OS_NAME=linux | 7 TRAVIS_OS_NAME=linux |
8 else ifeq (${raw_OS},Darwin) | 8 else ifeq (${raw_OS},Darwin) |
9 HOST_OS=mac | 9 HOST_OS=mac |
10 TRAVIS_OS_NAME=osx | 10 TRAVIS_OS_NAME=osx |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 get-prebuilt-v8: | 75 get-prebuilt-v8: |
76 URL_PREFIX="https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b54
1792669a/" \ | 76 URL_PREFIX="https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b54
1792669a/" \ |
77 TARGET_OS=${TARGET_OS} TARGET_ARCH=${TARGET_ARCH} \ | 77 TARGET_OS=${TARGET_OS} TARGET_ARCH=${TARGET_ARCH} \ |
78 TRAVIS_OS_NAME=${TRAVIS_OS_NAME} Configuration=${Configuration} \ | 78 TRAVIS_OS_NAME=${TRAVIS_OS_NAME} Configuration=${Configuration} \ |
79 bash .travis/prepare-prebuilt-v8.sh | 79 bash .travis/prepare-prebuilt-v8.sh |
80 | 80 |
81 clean: | 81 clean: |
82 $(RM) -r ${BUILD_DIR} docs | 82 $(RM) -r ${BUILD_DIR} docs |
83 | 83 |
84 ifeq ($(TARGET_OS),android) | 84 ifeq ($(TARGET_OS),android) |
| 85 SUB_ACTION ?= installed_modules |
85 all: ensure_dependencies | 86 all: ensure_dependencies |
86 GYP_DEFINES="${GYP_PARAMETERS}" \ | 87 GYP_DEFINES="${GYP_PARAMETERS}" \ |
87 python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.
gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.g
yp | 88 python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.
gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.g
yp |
88 » $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \ | 89 » $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} ${SUB_ACTION} \ |
89 BUILDTYPE=Release \ | 90 BUILDTYPE=Release \ |
90 APP_ABI=$(ANDROID_ABI) \ | 91 APP_ABI=$(ANDROID_ABI) \ |
91 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ | 92 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ |
92 APP_PIE=true \ | 93 APP_PIE=true \ |
93 APP_STL=c++_shared \ | 94 APP_STL=c++_shared \ |
94 APP_BUILD_SCRIPT=Makefile \ | 95 APP_BUILD_SCRIPT=Makefile \ |
95 NDK_PROJECT_PATH=. \ | 96 NDK_PROJECT_PATH=. \ |
96 NDK_OUT=. \ | 97 NDK_OUT=. \ |
97 ${ANDROID_FIXES} \ | 98 ${ANDROID_FIXES} \ |
98 NDK_APP_DST_DIR=android-$(TARGET_ARCH).release | 99 NDK_APP_DST_DIR=android-$(TARGET_ARCH).release |
99 else | 100 else |
| 101 SUB_ACTION ?= all |
100 all: ensure_dependencies | 102 all: ensure_dependencies |
101 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I
libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp | 103 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I
libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp |
102 » $(MAKE) -C ${BUILD_DIR} | 104 » $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} |
103 | 105 |
104 endif | 106 endif |
OLD | NEW |