Merge "Update CtsShim to use sharedUserId"

packages/CtsShim/build/Android.bp

@@ -48,13 +48,13 @@ android_app {
 }
 
 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)",
 }
 
 //##########################################################
@@ -140,6 +140,34 @@ android_app {
     ],
 }
 
+//##########################################################
+// 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
 
@@ -154,7 +182,7 @@ android_app {
         enabled: false,
     },
 
-    manifest: "shim/AndroidManifest.xml",
+    manifest: ":generate_shim_manifest",
     apex_available: [
         "//apex_available:platform",
         "com.android.apex.cts.shim.v1",

packages/CtsShim/build/shim/AndroidManifest.xml

@@ -17,13 +17,15 @@
 <!-- Manifest for the system CTS shim -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.cts.ctsshim" >
+    package="com.android.cts.ctsshim"
+    android:sharedUserId="com.android.cts.ctsshim" >
 
-    <uses-sdk android:minSdkVersion="24"
+    <uses-sdk
+        android:minSdkVersion="24"
         android:targetSdkVersion="28" />
 
     <restrict-update
-        android:hash="__CAN_NOT_BE_UPDATED__" />
+        android:hash="__HASH__" />
 
     <application
         android:hasCode="false"

packages/CtsShim/build/shim/AndroidManifestUpgrade.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Manifest for the system CTS shim -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.android.cts.ctsshim" >
+
+    <uses-sdk
+        android:minSdkVersion="24"
+        android:targetSdkVersion="28" />
+
+    <application
+        android:hasCode="false"
+        tools:ignore="AllowBackup,MissingApplicationIcon" />
+</manifest>
+