Makefile - Issue 29509595: Noissue - fix running of native tests on android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: Makefile

Issue 29509595: Noissue - fix running of native tests on android (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git

Patch Set: Created Aug. 8, 2017, 1:02 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

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 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116	116

117 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH}	117 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH}

118	118

119 android_multi: ${BUILD_V8} ensure_dependencies	119 android_multi: ${BUILD_V8} ensure_dependencies

120 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \	120 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \

121 python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp	121 python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp

122 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \	122 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \

123 BUILDTYPE=Release \	123 BUILDTYPE=Release \

124 APP_ABI=$(ANDROID_ABI) \	124 APP_ABI=$(ANDROID_ABI) \

125 APP_PLATFORM=android-9 \	125 APP_PLATFORM=android-9 \

	126 APP_PIE=true \

126 APP_STL=c++_static \	127 APP_STL=c++_static \

127 APP_BUILD_SCRIPT=Makefile \	128 APP_BUILD_SCRIPT=Makefile \

128 NDK_PROJECT_PATH=. \	129 NDK_PROJECT_PATH=. \

129 NDK_OUT=. \	130 NDK_OUT=. \

130 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)	131 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)

131 endif	132 endif

132	133

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »