build/android/envsetup.sh - Issue 221933012: android envsetup: Stop exporting ANDROID_NDK_ROOT.

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 221933012: android envsetup: Stop exporting ANDROID_NDK_ROOT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wrap Created 6 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.sh

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

index f558f133c8f0980cc6f4789b945d0b646415ece2..7f99d2bbb8435386d96e3b90e1481c5797df2d71 100755

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

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

@@ -48,9 +48,6 @@ fi

# Allow the caller to override a few environment variables. If any of them is

# unset, we default to a sane value that's known to work. This allows for

# experimentation with a custom SDK.

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

- export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"

-fi

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

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

« no previous file with comments | « build/android/adb_gdb ('k') | build/android/pylib/utils/emulator.py » ('j') | no next file with comments »