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

Commit 46c47efc authored by Anton Hansson's avatar Anton Hansson
Browse files

Simplify module visibility post build refactor 

//visibility:override is no longer needed for impl_library_visibility
to override visibility.

Removing this allows the defaults module to specify better defaults.

- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
  by the modules

Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
parent 94fbf790

apex/media/framework/Android.bp

+2 −11
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ java_library { 
    plugins: ["java_api_finder"],



    hostdex: true, // for hiddenapi check

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

    apex_available: [

        "com.android.media",

        "test_com.android.media",
@@ -99,15 +98,7 @@ java_sdk_library { 
    libs: [

        "framework_media_annotation",

    ],



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

    ],

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

}

apex/permission/framework/Android.bp

+1 −7
Original line number Diff line number Diff line
@@ -25,14 +25,8 @@ 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__",

    ],

    impl_library_visibility: ["//frameworks/base/apex/permission:__subpackages__"],



    srcs: [

        ":framework-permission-sources",

apex/permission/service/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -23,15 +23,7 @@ filegroup { 
java_sdk_library {

    name: "service-permission",

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

    visibility: [

        "//frameworks/base/services/core",

        "//frameworks/base/apex/permission",

        "//frameworks/base/apex/permission/testing",

        "//frameworks/base/apex/permission/tests",

        "//frameworks/base/services/tests/mockingservicestests",

    ],

    impl_library_visibility: [

        "//visibility:override",

        "//frameworks/base/apex/permission/tests",

        "//frameworks/base/services/tests/mockingservicestests",

        "//frameworks/base/services/tests/servicestests",

apex/statsd/framework/Android.bp

+1 −13
Original line number Diff line number Diff line
@@ -72,19 +72,7 @@ java_sdk_library { 


    hostdex: true, // for hiddenapi check



    visibility: [

        "//frameworks/base", // Framework

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

        "//frameworks/base/packages/Tethering", // Tethering

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

    ],

    impl_library_visibility: ["//frameworks/base/apex/statsd/framework/test:__subpackages__"],



    apex_available: [

        "com.android.os.statsd",

packages/Tethering/common/TetheringLib/Android.bp

+2 −12
Original line number Diff line number Diff line
@@ -16,19 +16,9 @@ 
java_sdk_library {

    name: "framework-tethering",

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

    impl_library_visibility: ["//frameworks/base/packages/Tethering:__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/base/packages/Tethering:__subpackages__",

    ],



    srcs: [

        ":framework-tethering-srcs",

    ],

    srcs: [":framework-tethering-srcs"],



    jarjar_rules: "jarjar-rules.txt",

    installable: true,