build/android/envsetup_functions.sh - Issue 12917006: Android WebView: change how the SDK jar is found.

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_functions.sh

Issue 12917006: Android WebView: change how the SDK jar is found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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_functions.sh

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

index 88f4421f3b05a1f327252053780a5ccbff9dca17..53fb72fd5168ad512dffd4bd26ab9798a717341f 100755

--- a/build/android/envsetup_functions.sh

+++ b/build/android/envsetup_functions.sh

@@ -288,7 +288,8 @@ ${ANDROID_SDK_VERSION}

# temporary until all uses of android_build_type are gone (crbug.com/184431)

DEFINES+=" android_build_type=1"

DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"

- DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"

+ DEFINES+=" android_sdk=NOT_USED_ON_WEBVIEW"

+ DEFINES+=" android_sdk_jar=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}/android.jar"

DEFINES+=" android_sdk_root=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"

DEFINES+=" android_sdk_tools=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK_TOOLS}"

DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"

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