diff options
| author | 2023-04-25 16:18:42 -0400 | |
|---|---|---|
| committer | 2023-05-15 17:38:59 -0400 | |
| commit | b5e01c5acd286a7c20ec419424fd4051c524a7f7 (patch) | |
| tree | b3fc879768f2842922524cf55ee5ead9f11bc509 | |
| parent | 27dddc4f051e8affffe2d19bae96e840debdabad (diff) | |
use privapp_allowlist property
Test: m com.android.permission com.google.android.permission and verify
manually that apex_payload.img contains correct privapp_allowlist
Bug: 242509786
Change-Id: I9096cf02e4d0f74f62f4a2d11a34cafd51770ad0
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | PermissionController/Android.bp | 2 | ||||
| -rw-r--r-- | permissions/Android.bp | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index 4a436da6c..bf7437814 100644 --- a/Android.bp +++ b/Android.bp @@ -30,7 +30,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", diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index fc1610e79..3b6d14744 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -82,7 +82,7 @@ android_app { privileged: true, certificate: "platform", rename_resources_package: false, - required: ["privapp_allowlist_com.android.permissioncontroller.xml"], + privapp_allowlist: ":privapp_allowlist_com.android.permissioncontroller.xml", srcs: [":permissioncontroller-sources"], diff --git a/permissions/Android.bp b/permissions/Android.bp index 8c7dab40b..6c1fdb8f8 100644 --- a/permissions/Android.bp +++ b/permissions/Android.bp @@ -19,9 +19,7 @@ package { default_visibility: ["//packages/modules/Permission:__subpackages__"], } -prebuilt_etc { +filegroup { name: "privapp_allowlist_com.android.permissioncontroller.xml", - sub_dir: "permissions", - src: "com.android.permissioncontroller.xml", - installable: false, + srcs: ["com.android.permissioncontroller.xml"], } |