From 5262167584b199f9fdc0b9f9ae141ef3cee5a643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Fri, 4 Oct 2019 09:24:54 +0200 Subject: [PATCH] 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 --- tests/Codegen/runTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Codegen/runTest.sh b/tests/Codegen/runTest.sh index 01522735ec3ce..5f03b5f41648b 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