Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: Makefile

Issue 29510583: Issue 5393 - fix libraries order issue when linking of V8 mksnapshot for linux host (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: Created Aug. 9, 2017, 12:41 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | make_gyp_wrapper.py » ('j') | make_gyp_wrapper.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ANDROID_ARCH="arm" $(MAKE) android_multi 89 ANDROID_ARCH="arm" $(MAKE) android_multi
90 90
91 android_arm64: 91 android_arm64:
92 ANDROID_ARCH="arm64" $(MAKE) android_multi 92 ANDROID_ARCH="arm64" $(MAKE) android_multi
93 93
94 ifneq ($(ANDROID_ARCH),) 94 ifneq ($(ANDROID_ARCH),)
95 v8_android_multi: ensure_dependencies 95 v8_android_multi: ensure_dependencies
96 cd third_party/v8 && GYP_GENERATORS=make-android \ 96 cd third_party/v8 && GYP_GENERATORS=make-android \
97 GYP_DEFINES="${GYP_PARAMETERS} v8_target_arch=${ANDROID_ARCH}" \ 97 GYP_DEFINES="${GYP_PARAMETERS} v8_target_arch=${ANDROID_ARCH}" \
98 PYTHONPATH="${V8_DIR}tools/generate_shim_headers:${V8_DIR}gypfiles:${P YTHONPATH}" \ 98 PYTHONPATH="${V8_DIR}tools/generate_shim_headers:${V8_DIR}gypfiles:${P YTHONPATH}" \
99 » tools/gyp/gyp \ 99 » python ../../make_gyp_wrapper.py \
100 --generator-output=../../build src/v8.gyp \ 100 --generator-output=../../build src/v8.gyp \
101 -Igypfiles/standalone.gypi \ 101 -Igypfiles/standalone.gypi \
102 --depth=. \ 102 --depth=. \
103 -S.android_${ANDROID_ARCH}.release \ 103 -S.android_${ANDROID_ARCH}.release \
104 -I../../android-v8-options.gypi 104 -I../../android-v8-options.gypi
105 cd third_party/v8 && make \ 105 cd third_party/v8 && make \
106 -C ../../build \ 106 -C ../../build \
107 -f Makefile.android_${ANDROID_ARCH}.release \ 107 -f Makefile.android_${ANDROID_ARCH}.release \
108 v8_snapshot v8_libplatform v8_libsampler \ 108 v8_snapshot v8_libplatform v8_libsampler \
109 BUILDTYPE=Release \ 109 BUILDTYPE=Release \
(...skipping 20 matching lines...) Expand all
130 APP_ABI=$(ANDROID_ABI) \ 130 APP_ABI=$(ANDROID_ABI) \
131 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ 131 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \
132 APP_PIE=true \ 132 APP_PIE=true \
133 APP_STL=c++_static \ 133 APP_STL=c++_static \
134 APP_BUILD_SCRIPT=Makefile \ 134 APP_BUILD_SCRIPT=Makefile \
135 NDK_PROJECT_PATH=. \ 135 NDK_PROJECT_PATH=. \
136 NDK_OUT=. \ 136 NDK_OUT=. \
137 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) 137 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)
138 endif 138 endif
139 139
OLDNEW
« no previous file with comments | « no previous file | make_gyp_wrapper.py » ('j') | make_gyp_wrapper.py » ('J')

Powered by Google App Engine
This is Rietveld