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

Merge "Make CtsShim targets available to cts shim apex." into rvc-dev am: 2bc67bea15 am: e5e2e35e0e

Browse Source 
Change-Id: Ic0402c277042a9133f665a8aba65f13691d5a4ab
This commit is contained in:
TreeHugger Robot
2020-04-20 17:44:26 +00:00
committed by Automerger Merge Worker
parent 38229eef88 e5e2e35e0e
commit efc6b9cb78
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,14 @@ android_app {
// Explicitly uncompress native libs rather than letting the build system doing it and destroy the // Explicitly uncompress native libs rather than letting the build system doing it and destroy the
// v2/v3 signature. // v2/v3 signature.
use_embedded_native_libs: true, use_embedded_native_libs: true,
apex_available: [
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",
"com.android.apex.cts.shim.v3",
],
} }
//########################################################## //##########################################################
@@ -110,7 +118,10 @@ android_app {
dex_preopt: { dex_preopt: {
enabled: false, enabled: false,
}, },
manifest: "shim/AndroidManifestTargetPSdk.xml" manifest: "shim/AndroidManifestTargetPSdk.xml",
apex_available: [
"com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p",
],
} }
//########################################################## //##########################################################
@@ -128,4 +139,12 @@ android_app {
}, },
manifest: "shim/AndroidManifest.xml", manifest: "shim/AndroidManifest.xml",
apex_available: [
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",
"com.android.apex.cts.shim.v3",
],
} }

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

@@ -18,4 +18,13 @@ cc_library_shared {
name: "libshim_jni", name: "libshim_jni",
srcs: ["Shim.c"], srcs: ["Shim.c"],
sdk_version: "24", sdk_version: "24",
apex_available: [
"//apex_available:platform",
"com.android.apex.cts.shim.v1",
"com.android.apex.cts.shim.v2",
"com.android.apex.cts.shim.v2_no_hashtree",
"com.android.apex.cts.shim.v2_legacy",
"com.android.apex.cts.shim.v2_sdk_target_p",
"com.android.apex.cts.shim.v3",
],
} }