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

Commit adc468f1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am:... 

Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d am: 1b11ca25" into tm-dev-plus-aosp am: f2df35dc am: d3c75442

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



Change-Id: I50b9e2c5d4fb8a430680dc2ce900cca895d8ab97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b91d21f8 d3c75442

packages/CtsShim/build/Android.bp

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

packages/CtsShim/build/jni/Android.bp

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