Update CtsShim to use sharedUserId
For testing system apps migrating out of sharedUserId through an
upgrade, we need to have CtsShim first be a shared UID app.
This is necessary to test ag/15936308
Bug: 179284822
Test: tapas CtsShim CtsShimUpgrade; m
Change-Id: Ibcd8dba32a2e0e3ae2a7d1f5a19fac57dff8bca3
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 0b3f9bb..68b6091 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -48,13 +48,13 @@
}
genrule {
- name: "generate_priv_manifest",
- srcs: [
- "shim_priv/AndroidManifest.xml",
- ":CtsShimPrivUpgrade"
- ],
- out: ["AndroidManifest.xml"],
- cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimPrivUpgrade) | cut -d' ' -f1`/ $(location shim_priv/AndroidManifest.xml) > $(out)",
+ name: "generate_priv_manifest",
+ srcs: [
+ "shim_priv/AndroidManifest.xml",
+ ":CtsShimPrivUpgrade",
+ ],
+ out: ["AndroidManifest.xml"],
+ cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimPrivUpgrade) | cut -d' ' -f1`/ $(location shim_priv/AndroidManifest.xml) > $(out)",
}
//##########################################################
@@ -141,6 +141,34 @@
}
//##########################################################
+// Variant: System app upgrade
+
+android_app {
+ name: "CtsShimUpgrade",
+
+ sdk_version: "current",
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+
+ manifest: "shim/AndroidManifestUpgrade.xml",
+ min_sdk_version: "24",
+}
+
+genrule {
+ name: "generate_shim_manifest",
+ srcs: [
+ "shim/AndroidManifest.xml",
+ ":CtsShimUpgrade",
+ ],
+ out: ["AndroidManifest.xml"],
+ cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimUpgrade) | cut -d' ' -f1`/ $(location shim/AndroidManifest.xml) > $(out)",
+}
+
+//##########################################################
// Variant: System app
android_app {
@@ -154,7 +182,7 @@
enabled: false,
},
- manifest: "shim/AndroidManifest.xml",
+ manifest: ":generate_shim_manifest",
apex_available: [
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
