diff options
| author | Dario Freni <dariofreni@google.com> | 2020-04-20 16:47:43 +0100 |
|---|---|---|
| committer | Dario Freni <dariofreni@google.com> | 2020-04-20 16:47:43 +0100 |
| commit | f2e402d6c2e20530fe74ffc34560dd955fe3db98 (patch) | |
| tree | d92a25db7f873c8a3fd7e8566d7705249e658b1b | |
| parent | 9c50a64e914507de422679c98878592d0376693c (diff) | |
Make CtsShim targets available to cts shim apex.
Bug: 148489495
Test: mm
Change-Id: I781d0a778b58cb3b96bf421355c29e888f372a56
| -rw-r--r-- | packages/CtsShim/build/Android.bp | 21 | ||||
| -rw-r--r-- | packages/CtsShim/build/jni/Android.bp | 9 |
2 files changed, 29 insertions, 1 deletions
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp index 587109d5dae9..54986a43a870 100644 --- a/packages/CtsShim/build/Android.bp +++ b/packages/CtsShim/build/Android.bp @@ -69,6 +69,14 @@ android_app { // Explicitly uncompress native libs rather than letting the build system doing it and destroy the // v2/v3 signature. 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: { 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", + 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", + ], } diff --git a/packages/CtsShim/build/jni/Android.bp b/packages/CtsShim/build/jni/Android.bp index ea15b43416b4..7a5b07e61e9d 100644 --- a/packages/CtsShim/build/jni/Android.bp +++ b/packages/CtsShim/build/jni/Android.bp @@ -18,4 +18,13 @@ cc_library_shared { name: "libshim_jni", srcs: ["Shim.c"], 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", + ], } |