Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am: d6359a85af am: 89b8598db4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090725

Change-Id: Ide5f64759c5461fff5d7e2b1a05e6149b6533963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nikita Ioffe
2022-05-02 23:20:33 +00:00
committed by Automerger Merge Worker
parent b759da5e55 89b8598db4
commit c85762e847
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CtsShim/build/Android.bp
View File

@@ -45,6 +45,10 @@ android_app {
jni_libs: ["libshim_jni"],
uses_libs: ["android.test.runner"],
apex_available: [
"com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
],
}
genrule {
@@ -84,6 +88,7 @@ android_app {
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",
@@ -187,6 +192,7 @@ android_app {
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",

1
packages/CtsShim/build/jni/Android.bp
View File

@@ -32,6 +32,7 @@ cc_library_shared {
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",