diff options
| author | 2018-01-01 21:13:46 +0000 | |
|---|---|---|
| committer | 2018-01-01 21:18:56 +0000 | |
| commit | bf7fbc28a885d50a336eb7a191d24dc15f075360 (patch) | |
| tree | f9e4665f4d41b0fdd202d8461c725e948cf6116c | |
| parent | a13628ed118c821eef5e2eaf76a9b17ac27a405f (diff) | |
Rename ANDROID_PRODUCT_OUT -> PRODUCT_OUT.
Change-Id: I95cb69931b9d18e26ccd75ff59d9c5d1a11a2764
| -rwxr-xr-x | test/run-test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/run-test b/test/run-test index 75fe15c919..be8a5a63b8 100755 --- a/test/run-test +++ b/test/run-test @@ -520,10 +520,10 @@ elif [ "$trace_stream" = "true" ]; then fi # Most interesting target architecture variables are Makefile variables, not environment variables. -# Try to map the suffix64 flag and what we find in ${ANDROID_PRODUCT_OUT}/data/art-test to an architecture name. +# Try to map the suffix64 flag and what we find in ${PRODUCT_OUT}/data/art-test to an architecture name. function guess_target_arch_name() { - grep32bit=`ls ${ANDROID_PRODUCT_OUT}/data/art-test | grep -E '^(arm|x86|mips)$'` - grep64bit=`ls ${ANDROID_PRODUCT_OUT}/data/art-test | grep -E '^(arm64|x86_64|mips64)$'` + grep32bit=`ls ${PRODUCT_OUT}/data/art-test | grep -E '^(arm|x86|mips)$'` + grep64bit=`ls ${PRODUCT_OUT}/data/art-test | grep -E '^(arm64|x86_64|mips64)$'` if [ "x${suffix64}" = "x64" ]; then target_arch_name=${grep64bit} else @@ -562,7 +562,7 @@ fi if [ "$runtime" = "dalvik" ]; then if [ "$target_mode" = "no" ]; then - framework="${ANDROID_PRODUCT_OUT}/system/framework" + framework="${PRODUCT_OUT}/system/framework" bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/bouncycastle.jar:${framework}/ext.jar" run_args="${run_args} --boot --runtime-option -Xbootclasspath:${bpath}" else |