From c6c98bdf5c2c77bbb848addbce1f97c0f2f9998d Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Wed, 27 Apr 2022 14:04:38 +0100 Subject: [PATCH] Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades The v2_apk_in_apex_upgrades APEX shim will be useful for testing fixes for apk-in-apex caching bug. Test: m com.android.apex.cts.shim.v2_apk_in_apex_upgrades Bug: 225435110 Change-Id: I5d2270b8341c0405bf256c417acff4279c6b8754 --- packages/CtsShim/build/Android.bp | 6 ++++++ packages/CtsShim/build/jni/Android.bp | 1 + 2 files changed, 7 insertions(+) diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp index 0b3f9bb62a9b9..54351131a4336 100644 --- a/packages/CtsShim/build/Android.bp +++ b/packages/CtsShim/build/Android.bp @@ -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", @@ -159,6 +164,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", diff --git a/packages/CtsShim/build/jni/Android.bp b/packages/CtsShim/build/jni/Android.bp index ba586dbb2d883..2dbf2a212cc32 100644 --- a/packages/CtsShim/build/jni/Android.bp +++ b/packages/CtsShim/build/jni/Android.bp @@ -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",