Makefile - Issue 29812577: Noissue - add a possibility to build only static library libadblockplus for nix

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

Unified Diff: Makefile

Issue 29812577: Noissue - add a possibility to build only static library libadblockplus for nix (Closed) Base URL: https://github.com/adblockplus/libadblockplus@7fd0f9791ae0ba8b6ed725351aeadf98e1fd111e

Patch Set: Created June 21, 2018, 10:20 a.m.

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Makefile

diff --git a/Makefile b/Makefile

index 5b1ceb7d263312ee301be6bc5047005ad6d06c05..fa5de3600d3317af14143b03e13501eeb4204ec1 100644

--- a/Makefile

+++ b/Makefile

@@ -82,10 +82,11 @@ clean:

$(RM) -r ${BUILD_DIR} docs

ifeq ($(TARGET_OS),android)

+SUB_ACTION ?= installed_modules

all: ensure_dependencies

GYP_DEFINES="${GYP_PARAMETERS}" \

python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.gyp

- $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \

+ $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} ${SUB_ACTION} \

BUILDTYPE=Release \

APP_ABI=$(ANDROID_ABI) \

APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \

@@ -97,8 +98,9 @@ all: ensure_dependencies

${ANDROID_FIXES} \

NDK_APP_DST_DIR=android-$(TARGET_ARCH).release

else

+SUB_ACTION ?= all

all: ensure_dependencies

GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp

- $(MAKE) -C ${BUILD_DIR}

+ $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION}

endif

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