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

Commit c7aa3f18 authored by Anton Hansson's avatar Anton Hansson
Browse files

Limit build visibility of modules in apex/... 

This changes the default visibility of soong modules in this directory
to __subpackages__, from the current public default.

This helps accidental dependencies sneaking in without intent from
the module owner.

Bug: 175604587
Test: m nothing
Change-Id: I1df8b8e087d27f62ce8c09d7e6e32d511efdba6b
parent ec0354cc

apex/Android.bp

+15 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,10 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





package {

    default_visibility: [":__subpackages__"],

}



mainline_stubs_args =

mainline_stubs_args =

    "--error UnhiddenSystemApi " +

    "--error UnhiddenSystemApi " +

    "--hide BroadcastBehavior " +

    "--hide BroadcastBehavior " +
@@ -136,6 +140,13 @@ java_defaults { 
        enabled: true,

        enabled: true,

        sdk_version: "module_current",

        sdk_version: "module_current",

    },

    },

    defaults_visibility: [

        ":__subpackages__",

        "//frameworks/base/libs/hwui",

        "//frameworks/base/wifi",

        "//packages/modules:__subpackages__",

        "//packages/providers/MediaProvider:__subpackages__",

    ],

}

}





// Defaults for mainline module system server provided java_sdk_library instances.

// Defaults for mainline module system server provided java_sdk_library instances.
@@ -147,6 +158,10 @@ java_defaults { 
        enabled: true,

        enabled: true,

        sdk_version: "module_current",

        sdk_version: "module_current",

    },

    },

    defaults_visibility: [

        ":__subpackages__",

        "//packages/modules:__subpackages__",

    ],

}

}





stubs_defaults {

stubs_defaults {

apex/appsearch/framework/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ filegroup { 
        "java/**/*.aidl",

        "java/**/*.aidl",

    ],

    ],

    path: "java",

    path: "java",

    visibility: ["//frameworks/base"],

}

}





java_sdk_library {

java_sdk_library {

apex/appsearch/service/Android.bp

+6 −0
Original line number Original line Diff line number Diff line
@@ -28,5 +28,11 @@ java_library { 
        "libicing",

        "libicing",

    ],

    ],

    jarjar_rules: "jarjar-rules.txt",

    jarjar_rules: "jarjar-rules.txt",

    visibility: [

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

        // These are required until appsearch is properly unbundled.

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

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

    ],

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

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

}
 
}

apex/blobstore/framework/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ filegroup { 
        "java/**/*.aidl"

        "java/**/*.aidl"

    ],

    ],

    path: "java",

    path: "java",

    visibility: ["//frameworks/base"],

}

}





java_library {

java_library {

apex/blobstore/service/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -25,4 +25,9 @@ java_library { 
        "services.core",

        "services.core",

        "services.usage",

        "services.usage",

    ],

    ],

    visibility: [

        // These are required until blobstore is properly unbundled.

        "//frameworks/base/services",

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

    ],

}
 
}