diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 19:42:03 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 19:42:03 +0000 |
| commit | 9fe7ff4c7187610a737a1ec2fa5fb21028ad4292 (patch) | |
| tree | aaf9845bfd28dcdf3a9177779c96331589e1c827 /build/android | |
| parent | da170202dea6c34e7f71b130274a09fa205e0c73 (diff) | |
| download | chromium_src-9fe7ff4c7187610a737a1ec2fa5fb21028ad4292.zip chromium_src-9fe7ff4c7187610a737a1ec2fa5fb21028ad4292.tar.gz chromium_src-9fe7ff4c7187610a737a1ec2fa5fb21028ad4292.tar.bz2 | |
android envsetup: Stop exporting ANDROID_SDK_ROOT.
The only reference to itwasis from an unused slave script
which I deleted in r262454.
BUG=330631
NOTRY=true
Review URL: https://codereview.chromium.org/226453006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/envsetup.sh | 2 | ||||
| -rw-r--r-- | build/android/pylib/instrumentation/test_jar.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index f5394f8..33247a2 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -36,7 +36,7 @@ android_envsetup_main() { # unset, we default to a sane value that's known to work. This allows for # experimentation with a custom SDK. if [[ -z "${ANDROID_SDK_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; then - export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" + local ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" fi # Add Android SDK tools to system path. diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py index 8ea3dbf..ee781c5 100644 --- a/build/android/pylib/instrumentation/test_jar.py +++ b/build/android/pylib/instrumentation/test_jar.py @@ -41,8 +41,7 @@ class TestJar(object): if not os.path.exists(jar_path): raise Exception('%s not found, please build it' % jar_path) - sdk_root = os.getenv('ANDROID_SDK_ROOT', constants.ANDROID_SDK_ROOT) - self._PROGUARD_PATH = os.path.join(sdk_root, + self._PROGUARD_PATH = os.path.join(constants.ANDROID_SDK_ROOT, 'tools/proguard/bin/proguard.sh') if not os.path.exists(self._PROGUARD_PATH): self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'], |