Merge "Create a shim apk which is malformed" into rvc-dev am: dcf4e5f441

Change-Id: Icfc164a66ae3897bb7ddf86e66eacfe269dd7759

packages/CtsShim/build/Android.bp

@@ -99,6 +99,20 @@ android_app {
 
 }
 
+//##########################################################
+// Variant: Non Privileged app upgrade which is malformed
+android_app {
+    name: "CtsShimTargetPSdk",
+    sdk_version: "current",
+    optimize: {
+        enabled: false,
+    },
+    dex_preopt: {
+        enabled: false,
+    },
+    manifest: "shim/AndroidManifestTargetPSdk.xml"
+}
+
 //##########################################################
 // Variant: System app
 

packages/CtsShim/build/shim/AndroidManifestTargetPSdk.xml

@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2020 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 xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.apk.cts.shim"
+          android:versionCode="2"
+          android:versionName="2.0" >
+
+    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="P" />
+</manifest>