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

Browse Source
This commit is contained in:
Nikita Ioffe
2022-05-02 22:25:07 +00:00
committed by Android (Google) Code Review
parent c3fc843b63 bd2af08bba
commit d6359a85af
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"], jni_libs: ["libshim_jni"],
uses_libs: ["android.test.runner"], uses_libs: ["android.test.runner"],
apex_available: [
"com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
],
} }
genrule { genrule {
@@ -84,6 +88,7 @@ android_app {
"//apex_available:platform", "//apex_available:platform",
"com.android.apex.cts.shim.v1", "com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2", "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_no_hashtree",
"com.android.apex.cts.shim.v2_legacy", "com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p", "com.android.apex.cts.shim.v2_sdk_target_p",
@@ -187,6 +192,7 @@ android_app {
"//apex_available:platform", "//apex_available:platform",
"com.android.apex.cts.shim.v1", "com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2", "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_no_hashtree",
"com.android.apex.cts.shim.v2_legacy", "com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p", "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", "//apex_available:platform",
"com.android.apex.cts.shim.v1", "com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2", "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_no_hashtree",
"com.android.apex.cts.shim.v2_legacy", "com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p", "com.android.apex.cts.shim.v2_sdk_target_p",