Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c85762e8 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am:... 

Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am: d6359a85 am: 89b8598d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090725



Change-Id: Ide5f64759c5461fff5d7e2b1a05e6149b6533963
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b759da5e 89b8598d

packages/CtsShim/build/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -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",

packages/CtsShim/build/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",