Side by Side Diff: Makefile
Issue 29555620:
Issue 5698 - Update V8 to 6.1.534.41 (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set:
Created Sept. 25, 2017, 7:46 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
build-v8.cmd » ('j')
|
build-v8-patch-v8.gyp.py » ('J')
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')
| OLD | NEW |
|---|---|
| 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ | 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ |
| 2 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py) | 2 HOST_ARCH :=$(shell python third_party/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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 android_arm ensure_dependencies | 55 android_arm ensure_dependencies |
| 56 | 56 |
| 57 .DEFAULT_GOAL:=all | 57 .DEFAULT_GOAL:=all |
| 58 | 58 |
| 59 do-nothing: | 59 do-nothing: |
| 60 | 60 |
| 61 ensure_dependencies: | 61 ensure_dependencies: |
| 62 python ensure_dependencies.py | 62 python ensure_dependencies.py |
| 63 | 63 |
| 64 build-v8: ensure_dependencies | 64 build-v8: ensure_dependencies |
| 65 python build-v8-patch-v8.gyp.py | |
| 65 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I build-v8.gypi --generator-output=build/v8 ${V8_DIR}src/v8.gyp | 66 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I build-v8.gypi --generator-output=build/v8 ${V8_DIR}src/v8.gyp |
| 66 make -C build/v8 v8_snapshot v8_libplatform v8_libsampler | 67 make -C build/v8 v8_snapshot v8_libplatform v8_libsampler |
| 67 | 68 |
| 68 all: ${BUILD_V8} ensure_dependencies | 69 all: ${BUILD_V8} ensure_dependencies |
| 69 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" third_party/gyp/gy p --depth=. -f make -I libadblockplus.gypi --generator-output=build libadblockpl us.gyp | 70 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" third_party/gyp/gy p --depth=. -f make -I libadblockplus.gypi --generator-output=build libadblockpl us.gyp |
| 70 $(MAKE) -C build | 71 $(MAKE) -C build |
| 71 | 72 |
| 72 test: all | 73 test: all |
| 73 ifdef FILTER | 74 ifdef FILTER |
| 74 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) | 75 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 86 ANDROID_ARCH="ia32" $(MAKE) android_multi | 87 ANDROID_ARCH="ia32" $(MAKE) android_multi |
| 87 | 88 |
| 88 android_arm: | 89 android_arm: |
| 89 ANDROID_ARCH="arm" $(MAKE) android_multi | 90 ANDROID_ARCH="arm" $(MAKE) android_multi |
| 90 | 91 |
| 91 android_arm64: | 92 android_arm64: |
| 92 ANDROID_ARCH="arm64" $(MAKE) android_multi | 93 ANDROID_ARCH="arm64" $(MAKE) android_multi |
| 93 | 94 |
| 94 ifneq ($(ANDROID_ARCH),) | 95 ifneq ($(ANDROID_ARCH),) |
| 95 v8_android_multi: ensure_dependencies | 96 v8_android_multi: ensure_dependencies |
| 97 python build-v8-patch-v8.gyp.py | |
| 96 cd third_party/v8 && GYP_GENERATORS=make-android \ | 98 cd third_party/v8 && GYP_GENERATORS=make-android \ |
| 97 GYP_DEFINES="${GYP_PARAMETERS} v8_target_arch=${ANDROID_ARCH}" \ | 99 GYP_DEFINES="${GYP_PARAMETERS} v8_target_arch=${ANDROID_ARCH}" \ |
| 98 PYTHONPATH="${V8_DIR}tools/generate_shim_headers:${V8_DIR}gypfiles:${P YTHONPATH}" \ | 100 PYTHONPATH="${V8_DIR}tools/generate_shim_headers:${V8_DIR}gypfiles:${P YTHONPATH}" \ |
| 99 python ../../make_gyp_wrapper.py \ | 101 python ../../make_gyp_wrapper.py \ |
| 100 --generator-output=../../build src/v8.gyp \ | 102 --generator-output=../../build src/v8.gyp \ |
| 101 -Igypfiles/standalone.gypi \ | 103 -Igypfiles/standalone.gypi \ |
| 102 --depth=. \ | 104 --depth=. \ |
| 103 -S.android_${ANDROID_ARCH}.release \ | 105 -S.android_${ANDROID_ARCH}.release \ |
| 104 -I../../android-v8-options.gypi | 106 -I../../android-v8-options.gypi |
| 105 cd third_party/v8 && make \ | 107 cd third_party/v8 && make \ |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 130 APP_ABI=$(ANDROID_ABI) \ | 132 APP_ABI=$(ANDROID_ABI) \ |
| 131 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ | 133 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ |
| 132 APP_PIE=true \ | 134 APP_PIE=true \ |
| 133 APP_STL=c++_static \ | 135 APP_STL=c++_static \ |
| 134 APP_BUILD_SCRIPT=Makefile \ | 136 APP_BUILD_SCRIPT=Makefile \ |
| 135 NDK_PROJECT_PATH=. \ | 137 NDK_PROJECT_PATH=. \ |
| 136 NDK_OUT=. \ | 138 NDK_OUT=. \ |
| 137 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) | 139 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
| 138 endif | 140 endif |
| 139 | 141 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
build-v8.cmd » ('j')
|
build-v8-patch-v8.gyp.py » ('J')
