summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp28
1 files changed, 25 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 6356b4c57..3856a57b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,8 +24,7 @@ apex {
apex_defaults {
name: "com.android.permission-defaults",
- updatable: true,
- min_sdk_version: "30",
+ defaults: ["r-launched-apex-module"],
bootclasspath_fragments: ["com.android.permission-bootclasspath-fragment"],
systemserverclasspath_fragments: ["com.android.permission-systemserverclasspath-fragment"],
prebuilts: ["current_sdkinfo"],
@@ -56,7 +55,7 @@ filegroup {
sdk {
name: "permission-module-sdk",
bootclasspath_fragments: ["com.android.permission-bootclasspath-fragment"],
- java_sdk_libs: ["service-permission"],
+ systemserverclasspath_fragments: ["com.android.permission-systemserverclasspath-fragment"],
}
// Encapsulate the contributions made by the com.android.permission to the bootclasspath.
@@ -81,6 +80,29 @@ bootclasspath_fragment {
additional_stubs: [
"android-non-updatable",
],
+
+ hidden_api: {
+ // The following packages contain classes from other modules on the
+ // bootclasspath. That means that the hidden API flags for this module
+ // has to explicitly list every single class this module provides in
+ // that package to differentiate them from the classes provided by other
+ // modules. That can include private classes that are not part of the
+ // API.
+ split_packages: [
+ "android.permission",
+ ],
+
+ // The following packages and all their subpackages currently only
+ // contain classes from this bootclasspath_fragment. Listing a package
+ // here won't prevent other bootclasspath modules from adding classes in
+ // any of those packages but it will prevent them from adding those
+ // classes into an API surface, e.g. public, system, etc.. Doing so will
+ // result in a build failure due to inconsistent flags.
+ package_prefixes: [
+ "android.app.role",
+ "com.android.permission",
+ ],
+ },
}
// Encapsulate the contributions made by the com.android.permission to the systemserverclasspath.