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

Commit b767fcb0 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Removing com.android.apex.cts.shim.v2_no_hashtree" into main am: 11564060 am: 91e54516 

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



Change-Id: I3b9a6348626ceb5b5cedf08951591ff3d973a559
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35958bc9 91e54516

packages/CtsShim/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ android_app_import { 
        "com.android.apex.cts.shim.v1",

        "com.android.apex.cts.shim.v2",

        "com.android.apex.cts.shim.v2_legacy",

        "com.android.apex.cts.shim.v2_no_hashtree",

        "com.android.apex.cts.shim.v2_sdk_target_p",

        "com.android.apex.cts.shim.v3",

    ],
@@ -102,7 +101,6 @@ android_app_import { 
        "com.android.apex.cts.shim.v1",

        "com.android.apex.cts.shim.v2",

        "com.android.apex.cts.shim.v2_legacy",

        "com.android.apex.cts.shim.v2_no_hashtree",

        "com.android.apex.cts.shim.v2_sdk_target_p",

        "com.android.apex.cts.shim.v3",

    ],

packages/CtsShim/build/Android.bp

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

        "com.android.apex.cts.shim.v2_unsigned_payload",
@@ -200,7 +199,6 @@ android_app { 
        "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",

        "com.android.apex.cts.shim.v2_unsigned_payload",

packages/CtsShim/build/jni/Android.bp

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

        "com.android.apex.cts.shim.v2_unsigned_payload",