summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Ioffe <ioffe@google.com>2022-04-27 14:07:03 +0100
committerNikita Ioffe <ioffe@google.com>2022-04-27 14:07:03 +0100
commit8384467185c511ed256080033222f03a2b4de0b5 (patch)
tree49038b7865e247ee4c6c336bd9f2f9b946ff488d
parent0f12f5c9b349ca0f5e9facec2789f20825b02d62 (diff)
downloadapex-8384467185c511ed256080033222f03a2b4de0b5.tar.gz
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: Ibf1a3ff2531da31e0e84ceaa381967c37ebf60da
-rw-r--r--shim/build/Android.bp14
1 files changed, 14 insertions, 0 deletions
diff --git a/shim/build/Android.bp b/shim/build/Android.bp
index 2fa99bf5..6dc64a3f 100644
--- a/shim/build/Android.bp
+++ b/shim/build/Android.bp
@@ -265,6 +265,7 @@ genrule {
":com.android.apex.cts.shim.v2_with_post_install_hook",
":com.android.apex.cts.shim.v2_sdk_target_p",
":com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p",
+ ":com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
":com.android.apex.cts.shim.v2_rebootless",
":com.android.apex.cts.shim.v3",
":com.android.apex.cts.shim.v3_rebootless",
@@ -582,3 +583,16 @@ apex {
installable: false,
updatable: false,
}
+
+// Apex shim with upgraded apk-in-apexes
+apex {
+ name: "com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
+ manifest: "manifest_v2.json",
+ androidManifest: "AndroidManifest.xml",
+ file_contexts: ":apex.test-file_contexts",
+ key: "com.android.apex.cts.shim.key",
+ prebuilts: ["hash_of_dev_null"],
+ apps: ["CtsShim", "CtsShimPrivUpgrade"],
+ installable: false,
+ updatable: false,
+}