commit b50e662b3e55014c73a9eccdc5bbbc22311cce1a
author Jiyong Park <jiyong@google.com> Tue Apr 21 22:36:31 2020 +0900
committer Jiyong Park <jiyong@google.com> Wed Apr 22 11:45:54 2020 +0900
tree 99d4691aa1c5187caf1c86cd30e287459eb55fe1
parent fcdacd8e0c6c225e486252b79e629b2de7a4825d

Make CtsShim*Prebuilt be available to the test APEXes

android_app_import now supports apex_available property. Fill the
property for the CtsShim*Prebuilt apks so that they can be correctly
included in the test APEXes.

Bug: 154488897
Test: m
Change-Id: I9cf2e30bb38abbb33bf76a0eab0dc2a10a5647c9

packages/CtsShim/Android.bp

diff --git a/packages/CtsShim/Android.bp b/packages/CtsShim/Android.bp
index 7728464..3487803 100644
--- a/packages/CtsShim/Android.bp
+++ b/packages/CtsShim/Android.bp
@@ -43,6 +43,15 @@
         },
     },
     presigned: true,
+
+    apex_available: [
+        "com.android.apex.cts.shim.v1",
+        "com.android.apex.cts.shim.v2",
+        "com.android.apex.cts.shim.v2_legacy",
+        "com.android.apex.cts.shim.v2_no_hashtree",
+        "com.android.apex.cts.shim.v2_sdk_target_p",
+        "com.android.apex.cts.shim.v3",
+    ],
 }
 
 //##########################################################
@@ -71,4 +80,13 @@
         },
     },
     presigned: true,
+
+    apex_available: [
+        "com.android.apex.cts.shim.v1",
+        "com.android.apex.cts.shim.v2",
+        "com.android.apex.cts.shim.v2_legacy",
+        "com.android.apex.cts.shim.v2_no_hashtree",
+        "com.android.apex.cts.shim.v2_sdk_target_p",
+        "com.android.apex.cts.shim.v3",
+    ],
 }