Delta Between Two Patch Sets: Makefile
Issue 29451722:
Issue 4907 - Update v8 to 5.7.278 in libadblockplus (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Left Patch Set: fix support of ARCH=ia32
Created June 2, 2017, 7:19 a.m.
Right Patch Set: independence from file mode of make_gyp_wrapper.py
Created July 4, 2017, 11:11 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
README.md » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ | 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ |
| 2 HOST_ARCH :=$(shell python ${V8_DIR}gypfiles/detect_v8_host_arch.py) | 2 HOST_ARCH :=$(shell python ${V8_DIR}gypfiles/detect_v8_host_arch.py) |
| 3 | 3 |
| 4 GYP_PARAMETERS=host_arch=${HOST_ARCH} | 4 GYP_PARAMETERS=host_arch=${HOST_ARCH} |
| 5 | 5 |
| 6 ifndef HOST_OS | 6 ifndef HOST_OS |
| 7 raw_OS = $(shell uname -s) | 7 raw_OS = $(shell uname -s) |
| 8 ifeq (${raw_OS},Linux) | 8 ifeq (${raw_OS},Linux) |
| 9 HOST_OS=linux | 9 HOST_OS=linux |
| 10 else ifeq (${raw_OS},Darwin) | 10 else ifeq (${raw_OS},Darwin) |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 v8_android_multi_linux_${ANDROID_ARCH}: v8_android_multi | 89 v8_android_multi_linux_${ANDROID_ARCH}: v8_android_multi |
| 90 | 90 |
| 91 v8_android_multi_mac_ia32: v8_android_multi | 91 v8_android_multi_mac_ia32: v8_android_multi |
| 92 find build/android_ia32.release/ -depth 1 -iname \*.a -exec ${ANDROID_ND K_ROOT}/toolchains/x86-4.9/prebuilt/darwin-x86_64/bin/i686-linux-android-ranlib {} \; | 92 find build/android_ia32.release/ -depth 1 -iname \*.a -exec ${ANDROID_ND K_ROOT}/toolchains/x86-4.9/prebuilt/darwin-x86_64/bin/i686-linux-android-ranlib {} \; |
| 93 | 93 |
| 94 v8_android_multi_mac_arm: v8_android_multi | 94 v8_android_multi_mac_arm: v8_android_multi |
| 95 find build/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK _ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux -androideabi-ranlib {} \; | 95 find build/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK _ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux -androideabi-ranlib {} \; |
| 96 | 96 |
| 97 android_multi: v8_android_multi_${HOST_OS}_${ANDROID_ARCH} | 97 android_multi: v8_android_multi_${HOST_OS}_${ANDROID_ARCH} |
| 98 GYP_DEFINES="${GYP_PARAMETERS}" \ | 98 GYP_DEFINES="${GYP_PARAMETERS}" \ |
| 99 » ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi -- generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp | 99 » python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp |
| 100 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ | 100 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ |
| 101 BUILDTYPE=Release \ | 101 BUILDTYPE=Release \ |
| 102 APP_ABI=$(ANDROID_ABI) \ | 102 APP_ABI=$(ANDROID_ABI) \ |
| 103 APP_PLATFORM=android-9 \ | 103 APP_PLATFORM=android-9 \ |
| 104 APP_STL=c++_static \ | 104 APP_STL=c++_static \ |
| 105 APP_BUILD_SCRIPT=Makefile \ | 105 APP_BUILD_SCRIPT=Makefile \ |
| 106 NDK_PROJECT_PATH=. \ | 106 NDK_PROJECT_PATH=. \ |
| 107 NDK_OUT=. \ | 107 NDK_OUT=. \ |
| 108 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) | 108 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
| 109 endif | 109 endif |
| 110 | 110 |
| LEFT | RIGHT |
« no previous file
|
README.md » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
