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

Commit 96d61bff authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Build permission against the module SDK"

parents 85231d53 90037453

apex/permission/framework/Android.bp

+1 −7
Original line number Diff line number Diff line
@@ -26,13 +26,7 @@ java_library { 
    srcs: [

        ":framework-permission-sources",

    ],

    // TODO(b/146758669): Use "system_current" after nullability annotations are system APIs.

    sdk_version: "core_current",

    libs: [

        "framework-annotations-lib",

        // TODO(b/146758669): Remove this line after nullability annotations are system APIs.

        "android_system_stubs_current",

    ],

    sdk_version: "module_current",

    apex_available: [

        "com.android.permission",

        "test_com.android.permission",

apex/permission/service/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -24,12 +24,9 @@ java_library { 
    srcs: [

        ":service-permission-sources",

    ],

    // TODO(b/146758669): Use "system_current" after nullability annotations are system APIs.

    sdk_version: "core_current",

    sdk_version: "module_current",

    libs: [

        "framework-annotations-lib",

        // TODO(b/146758669): Remove this line after nullability annotations are system APIs.

        "android_system_stubs_current",

        "framework-permission",

    ],

    apex_available: [