diff options
| author | 2018-10-21 14:13:56 +0000 | |
|---|---|---|
| committer | 2018-10-21 14:13:56 +0000 | |
| commit | 2bbfbba16f30bef3e6c4e1d933e6deb277dd07ab (patch) | |
| tree | 1322bf3b124063bfd1ed477156173266c08152d8 | |
| parent | fa9abc28c7825040812101210ccf9b99ef3d565a (diff) | |
| parent | 89e5a9f0e3dbb33d9dd6be6cffbc74e93a6c8faa (diff) | |
Merge "Remove DIST_DIR uses in ART."
| -rw-r--r-- | test/testrunner/env.py | 1 | ||||
| -rw-r--r-- | tools/build/var_list | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 1f4b829989..600edfa42b 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -141,5 +141,4 @@ ANDROID_JAVA_TOOLCHAIN = os.path.join(ANDROID_BUILD_TOP, # include platform prebuilt java, javac, etc in $PATH. os.environ['PATH'] = ANDROID_JAVA_TOOLCHAIN + ':' + os.environ['PATH'] -DIST_DIR = _get_build_var('DIST_DIR') SOONG_OUT_DIR = _get_build_var('SOONG_OUT_DIR') diff --git a/tools/build/var_list b/tools/build/var_list index 98a54725da..1ffbe6b862 100644 --- a/tools/build/var_list +++ b/tools/build/var_list @@ -35,5 +35,4 @@ HOST_OUT_EXECUTABLES ANDROID_JAVA_TOOLCHAIN # b/62653020 -DIST_DIR SOONG_OUT_DIR |