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

Commit c19422ac authored by Vinh Tran's avatar Vinh Tran Committed by Automerger Merge Worker
Browse files

Merge "Remove sdk_version if platform_apis is set" am: ac9b9911 am:... 

Merge "Remove sdk_version if platform_apis is set" am: ac9b9911 am: 3e589c33 am: 197bbecd am: 132ca2c3

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



Change-Id: I07e59b7f9a01247e7c6e4a773959b720c7a2f929
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adc468f1 132ca2c3

core/tests/PackageInstallerSessions/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -51,6 +51,5 @@ android_test { 
    ],



    platform_apis: true,

    sdk_version: "core_platform",

    test_suites: ["device-tests"],

}

core/tests/bugreports/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ android_test { 
        "truth-prebuilt",

    ],

    test_suites: ["general-tests"],

    sdk_version: "test_current",

    platform_apis: true,

}

core/tests/coretests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ android_test { 
    ],



    platform_apis: true,

    sdk_version: "core_platform",

    test_suites: ["device-tests"],



    certificate: "platform",

services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ package { 


android_test_helper_app {

    name: "PackageManagerServiceDeviceSideTests",

    sdk_version: "test_current",

    srcs: ["src/**/*.kt"],

    libs: [

        "android.test.base",