diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 16:13:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 16:13:37 +0000 |
| commit | 725926d90ce703cd69b34a48e124f6945f4ae222 (patch) | |
| tree | d96df4f58a76ec20ba45c6093d12cd61925ad452 /build/android | |
| parent | ba410a3cc9c53aa928f505c065d1f83f0ec7d73c (diff) | |
| download | chromium_src-725926d90ce703cd69b34a48e124f6945f4ae222.zip chromium_src-725926d90ce703cd69b34a48e124f6945f4ae222.tar.gz chromium_src-725926d90ce703cd69b34a48e124f6945f4ae222.tar.bz2 | |
android envsetup: Stop exporting ANDROID_NDK_ROOT.
Change its only user, adb_gdb, to instead use pylib.constants.
BUG=330631
NOTRY=true
Review URL: https://codereview.chromium.org/221933012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/adb_gdb | 13 | ||||
| -rwxr-xr-x | build/android/envsetup.sh | 3 | ||||
| -rw-r--r-- | build/android/pylib/utils/emulator.py | 2 |
3 files changed, 3 insertions, 15 deletions
diff --git a/build/android/adb_gdb b/build/android/adb_gdb index ee9f45f..a5e4918 100755 --- a/build/android/adb_gdb +++ b/build/android/adb_gdb @@ -245,12 +245,7 @@ them up automatically for you though: - host gdb client (e.g. arm-linux-androideabi-gdb) - directory with symbolic version of $PROGRAM_NAME's shared libraries. -If you have sourced Chromium's build/android/envsetup.sh, this script will -find all of them automatically. This is the recommended way to use it. - -Otherwise, if you have ANDROID_NDK_ROOT defined in your environment, -the script will use it to find the gdb and gdbserver binaries. You can -also use --ndk-dir=<path> to specify an alternative NDK installation +You can also use --ndk-dir=<path> to specify an alternative NDK installation directory. The script tries to find the most recent version of the debug version of @@ -342,10 +337,8 @@ if [ -z "$PACKAGE_NAME" ]; then fi if [ -z "$NDK_DIR" ]; then - if [ -z "$ANDROID_NDK_ROOT" ]; then - panic "Can't find NDK directory, please source \ -build/android/envsetup.sh!" - fi + ANDROID_NDK_ROOT=$(PYTHONPATH=build/android python -c \ +'from pylib.constants import ANDROID_NDK_ROOT; print ANDROID_NDK_ROOT,') else if [ ! -d "$NDK_DIR" ]; then panic "Invalid directory: $NDK_DIR" diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index b7ed352..70905fc 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -33,9 +33,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/" fi diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py index 6545463..7d57781 100644 --- a/build/android/pylib/utils/emulator.py +++ b/build/android/pylib/utils/emulator.py @@ -4,8 +4,6 @@ """Provides an interface to start and stop Android emulator. -Assumes system environment ANDROID_NDK_ROOT has been set. - Emulator: The class provides the methods to launch/shutdown the emulator with the android virtual device named 'avd_armeabi' . """ |