diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2019-10-04 09:24:54 +0200 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2019-10-04 17:13:44 -0700 |
| commit | 5262167584b199f9fdc0b9f9ae141ef3cee5a643 (patch) | |
| tree | 3f97196512ec9d7101b58d78a2c068b420953693 | |
| parent | 2f49522757f6d587bc8fc2b81e60544196f29fec (diff) | |
codegen: do not assume arch is arm64
Replace hard-coded path to CodegenTests.apk, which assumes the current
architechure is arm64, with dynamic lookup.
Test: manual (runTest.sh works on the aosp_x86_64-eng emulator)
Change-Id: I4110083f055a65375de89da95fdc07739a3d9da5
| -rwxr-xr-x | tests/Codegen/runTest.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Codegen/runTest.sh b/tests/Codegen/runTest.sh index 01522735ec3c..5f03b5f41648 100755 --- a/tests/Codegen/runTest.sh +++ b/tests/Codegen/runTest.sh @@ -16,7 +16,7 @@ else header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java && \ cd $ANDROID_BUILD_TOP && header_and_eval mmma -j16 frameworks/base/tests/Codegen && \ - header_and_eval adb install -r -t $ANDROID_PRODUCT_OUT/testcases/CodegenTests/arm64/CodegenTests.apk && \ + header_and_eval adb install -r -t "$(find $ANDROID_TARGET_OUT_TESTCASES -name 'CodegenTests.apk')" && \ # header_and_eval adb shell am set-debug-app -w com.android.codegentest && \ header_and_eval adb shell am instrument -w -e package com.android.codegentest com.android.codegentest/androidx.test.runner.AndroidJUnitRunner |