build/android/envsetup_functions.sh - Issue 152173002: android envsetup: If ANDROID_SDK_ROOT is set, honor it unconditionally.

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 152173002: android envsetup: If ANDROID_SDK_ROOT is set, honor it unconditionally. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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:

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

Download patch

Index: build/android/envsetup_functions.sh

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

index 151760b34ba2d9d6be54801262c234b3cb904ba0..6908d33a3993aa5ae9deaedd3e286740790072ac 100755

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

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

@@ -187,9 +187,7 @@ sdk_build_init() {

else

sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}"

- local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION}

- if [[ -z "${ANDROID_SDK_ROOT}" || \

- ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then

+ if [[ -z "${ANDROID_SDK_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; then

export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"

else

sdk_defines+=" android_sdk_root=${ANDROID_SDK_ROOT}"

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