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

Commit acf0078d authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Clean up the visibility rules for framework modules" into rvc-dev am:... 

Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53 am: 1320192e am: 42b4b242

Change-Id: I15eb542ecff199567da1d16e9d7c7bc2d1648563
parents 60dd52c7 42b4b242

apex/media/framework/Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -105,7 +105,14 @@ java_sdk_library { 
        "framework_media_annotation",

    ],



    visibility: ["//frameworks/av/apex:__subpackages__"],

    // Allow access to the stubs from anywhere.

    visibility: ["//visibility:public"],



    // Restrict access to implementation library.

    impl_library_visibility: [

       "//visibility:override", // Ignore the visibility property.

       "//frameworks/av/apex:__subpackages__",

    ],

}

apex/permission/framework/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ filegroup { 
java_sdk_library {

    name: "framework-permission",

    defaults: ["framework-module-defaults"],



    // Allow access to the stubs from anywhere.

    visibility: ["//visibility:public"],



    // Restrict access to implementation library.

    impl_library_visibility: [

        "//visibility:override", // Ignore the visibility property.

        "//frameworks/base/apex/permission:__subpackages__",

    ],



    srcs: [

        ":framework-permission-sources",

    ],
@@ -43,8 +53,4 @@ java_sdk_library { 
    ],

    hostdex: true,

    installable: true,

    visibility: [

        "//frameworks/base/apex/permission:__subpackages__",

    ],

    stubs_library_visibility: ["//visibility:public"],

}

apex/statsd/framework/Android.bp

+9 −4
Original line number Diff line number Diff line
@@ -75,15 +75,20 @@ java_sdk_library { 
    ],



    hostdex: true, // for hiddenapi check



    visibility: [

        "//frameworks/base/apex/statsd:__subpackages__",

    ],

    stubs_library_visibility: [

        "//frameworks/base", // Framework

        "//frameworks/base/apex/statsd", // statsd apex

        "//frameworks/base/apex/statsd:__subpackages__", // statsd apex

        "//frameworks/opt/net/wifi/service", // wifi service

        "//packages/providers/MediaProvider", // MediaProvider apk

    ],



    // Restrict access to implementation library.

    impl_library_visibility: [

        "//visibility:override", // Ignore the visibility property.

        "//frameworks/base/apex/statsd:__subpackages__", // statsd apex

    ],



    apex_available: [

        "com.android.os.statsd",

        "test_com.android.os.statsd",

packages/Tethering/common/TetheringLib/Android.bp

+10 −2
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ 
java_sdk_library {

    name: "framework-tethering",

    defaults: ["framework-module-defaults"],



    // Allow access to the stubs from anywhere.

    visibility: ["//visibility:public"],



    // Restrict access to implementation library.

    impl_library_visibility: [

        "//visibility:override", // Ignore the visibility property.

        "//frameworks/base/packages/Tethering:__subpackages__",

    ],



    srcs: [

        ":framework-tethering-srcs",

    ],
@@ -29,8 +39,6 @@ java_sdk_library { 
    installable: true,



    hostdex: true, // for hiddenapi check

    visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],

    stubs_library_visibility: ["//visibility:public"],

    apex_available: ["com.android.tethering"],

    permitted_packages: ["android.net"],

}

wifi/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -123,10 +123,16 @@ java_sdk_library { 
        enabled: false

    },

    hostdex: true, // for hiddenapi check

    visibility: [



    // Allow access to the stubs from anywhere.

    visibility: ["//visibility:public"],



    // Restrict access to implementation library.

    impl_library_visibility: [

        "//visibility:override", // Ignore the visibility property.

        "//frameworks/opt/net/wifi/service:__subpackages__",

    ] + test_access_hidden_api_whitelist,

    stubs_library_visibility: ["//visibility:public"],



    apex_available: [

        "com.android.wifi",

        "test_com.android.wifi",