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

Commit df27cf8d authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades"

parents d7145d4c c6c98bdf

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",
@@ -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",

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",