summaryrefslogtreecommitdiff
path: root/packages/CtsShim
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2020-06-20 09:54:25 +0900
committer Jooyung Han <jooyung@google.com> 2020-06-20 01:59:26 +0000
commitd1e2821aa7b2d3f57d736eb57c9470cd88a0cfeb (patch)
tree34507e64865130c817fa0dd2b63805476d42df5f /packages/CtsShim
parent17e2ed30584633a0fd7bb1533888882e76289f7a (diff)
Revert "Revert "Make CtsShim*Prebuilt be available to the test APEXes""
This reverts commit 77cd43a7211ea1a9fbfa90f74976fe9f9ef0631e. We need a cts shim apex target with prebuilts so that GSI can install cts shim apks as a part of flattened cts shim apex. Bug: 159392784 Test: lunch aosp_arm64-userdebug m droid => should have cts shim in /system/system_ext/apex/ Change-Id: Ib18dd105d7b959774654182783b973b732127986
Diffstat (limited to 'packages/CtsShim')
-rw-r--r--packages/CtsShim/Android.bp18
1 files changed, 18 insertions, 0 deletions
diff --git a/packages/CtsShim/Android.bp b/packages/CtsShim/Android.bp
index 7728464f8652..34878035051d 100644
--- a/packages/CtsShim/Android.bp
+++ b/packages/CtsShim/Android.bp
@@ -43,6 +43,15 @@ android_app_import {
},
},
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 @@ android_app_import {
},
},
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",
+ ],
}