Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades
The v2_apk_in_apex_upgrades APEX shim will be useful for testing fixes
for apk-in-apex caching bug.
Test: m com.android.apex.cts.shim.v2_apk_in_apex_upgrades
Bug: 225435110
Change-Id: I5d2270b8341c0405bf256c417acff4279c6b8754
Merged-In: I5d2270b8341c0405bf256c417acff4279c6b8754
(cherry picked from commit c6c98bdf5c2c77bbb848addbce1f97c0f2f9998d)
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 68b6091..7cf5385 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -45,6 +45,10 @@
jni_libs: ["libshim_jni"],
uses_libs: ["android.test.runner"],
+
+ apex_available: [
+ "com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
+ ],
}
genrule {
@@ -84,6 +88,7 @@
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
+ "com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",
@@ -187,6 +192,7 @@
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
+ "com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",