summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp11
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 4a436da6c..9b1857741 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_android_permissions",
default_applicable_licenses: ["Android-Apache-2.0"],
default_visibility: [":__subpackages__"],
}
@@ -21,6 +22,10 @@ apex {
name: "com.android.permission",
defaults: ["com.android.permission-defaults"],
manifest: "apex_manifest.json",
+ compat_configs: [
+ "framework-permission-s-compat-config",
+ ],
+ visibility: ["//packages/modules/common/build"],
}
apex_defaults {
@@ -30,7 +35,6 @@ apex_defaults {
systemserverclasspath_fragments: ["com.android.permission-systemserverclasspath-fragment"],
prebuilts: [
"current_sdkinfo",
- "privapp_allowlist_com.android.permissioncontroller.xml",
],
key: "com.android.permission.key",
certificate: ":com.android.permission.certificate",
@@ -67,8 +71,8 @@ sdk {
bootclasspath_fragment {
name: "com.android.permission-bootclasspath-fragment",
contents: [
- "framework-permission",
- "framework-permission-s",
+ "framework-permission",
+ "framework-permission-s",
],
apex_available: ["com.android.permission"],
@@ -105,6 +109,7 @@ bootclasspath_fragment {
// result in a build failure due to inconsistent flags.
package_prefixes: [
"android.app.role",
+ "android.app.ecm",
"android.permission.jarjar",
"android.safetycenter",
"android.safetylabel",