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

Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d48 am: 1b11ca259f" into tm-dev-plus-aosp am: f2df35dcf6

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

Change-Id: I38eeb29ded1697c1f8fd72fde2c177bf45a1d23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-04-29 19:31:04 +00:00
parent 16f08f10ff f2df35dcf6
commit d3c75442f6
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",