Avoid hardcode version of test-services package am: e008599aaa
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/2509667
Change-Id: I291e2e7881fec671f63264152f0876f7738eb3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 2fe8672..bed205e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -136,6 +136,14 @@
java_version: "11",
}
+// Avoid version number in apk file name
+genrule(
+ name = "test-services-normalized.apk",
+ srcs = [":test-services.apk"],
+ out = ["test-services-normalized.apk"],
+ cmd = "cp $(in) $(out)",
+)
+
// Main Target to build tradefed jar
tradefed_java_library_host {
name: "tradefed",
@@ -147,7 +155,7 @@
":TradefedContentProvider",
":TelephonyUtility",
":WifiUtil",
- ":test-services.apk",
+ ":test-services-normalized.apk",
],
static_libs: [
"tradefed-lib-core",
diff --git a/test_framework/com/android/tradefed/testtype/AndroidJUnitTest.java b/test_framework/com/android/tradefed/testtype/AndroidJUnitTest.java
index 5de0308..07e21f3 100644
--- a/test_framework/com/android/tradefed/testtype/AndroidJUnitTest.java
+++ b/test_framework/com/android/tradefed/testtype/AndroidJUnitTest.java
@@ -398,7 +398,7 @@
testServices = FileUtil.createTempFile("services", ".apk");
boolean extracted =
ResourceUtil.extractResourceAsFile(
- "/test-services-1.4.2.apk", testServices);
+ "/test-services-normalized.apk", testServices);
if (extracted) {
serviceInstaller = new TestAppInstallSetup();
// Service apk needs force-queryable
