build/android/envsetup.sh - Issue 10696047: Pass android_sdk as a variable to gyp

Keyboard Shortcuts

	File
u :	up to issue
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

	Issue
u :	up to list of issues
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

Unified Diff: build/android/envsetup.sh

Issue 10696047: Pass android_sdk as a variable to gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix style Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/envsetup.sh

diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh

index 3a3c6a7f9dd7bd9e79661169a0e39069f66e004a..bd647bf50bcd12d4ba2db9709b5b7fc77f20876e 100755

--- a/build/android/envsetup.sh

+++ b/build/android/envsetup.sh

@@ -150,6 +150,8 @@ DEFINES+=" enable_touch_events=1"

DEFINES+=" build_ffmpegsumo=0"

DEFINES+=" gtest_target_type=shared_library"

DEFINES+=" branding=Chromium"

+DEFINES+=\

+" android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}"

navabi 2012/06/29 20:29:52 This is fine upstream. Will not work downstream a

Steve Block 2012/07/02 09:23:41 Right, I'll resolve the 'ANDROID_BUILD_TOP' case w

export GYP_DEFINES="${DEFINES}"

« no previous file with comments | « no previous file | build/java_aidl.gypi » ('j') | no next file with comments »