diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-07-26 16:38:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-26 16:38:58 +0000 |
| commit | 897c64cca8b639d01877bc5d41e0c56028028a8a (patch) | |
| tree | 6680425cbc1d1ccdc62d9a038611f4552444fde1 | |
| parent | 8b96abedeea786f6be9fecd7b47009216a700ba1 (diff) | |
| parent | da95b8f19a710c491a3d74e127deb3fff4f66ed1 (diff) | |
| download | CellBroadcastReceiver-temp_sam_242648940.tar.gz | |
Merge changes from topic "fix-cbr-flattened-apex-privapp" am: da95b8f19atemp_sam_242648940
Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/2147161
Change-Id: Idd08be4f84c03d4a6ab972b0544791d540205e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | apex/permissions/Android.bp | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 0135713ce..0895a2fa9 100644 --- a/Android.bp +++ b/Android.bp @@ -72,7 +72,7 @@ android_app { manifest: "AndroidManifest_Platform.xml", system_ext_specific: true, privileged: true, - required: ["privapp_allowlist_com.android.cellbroadcastreceiver.xml"], + required: ["platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml"], } // source file shared with legacy cellbroadcast app diff --git a/apex/permissions/Android.bp b/apex/permissions/Android.bp index 392cd72e9..931d8c506 100644 --- a/apex/permissions/Android.bp +++ b/apex/permissions/Android.bp @@ -25,13 +25,22 @@ prebuilt_etc { installable: false, } +// For platform only variant prebuilt_etc { - name: "privapp_allowlist_com.android.cellbroadcastreceiver.xml", + name: "platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml", sub_dir: "permissions", src: "com.android.cellbroadcastreceiver.xml", system_ext_specific: true, visibility: ["//packages/apps/CellBroadcastReceiver"], - installable: false, + installable: true, +} + +// For platform only variant +prebuilt_etc { + name: "platform_privapp_allowlist_com.android.cellbroadcastservice.xml", + sub_dir: "permissions", + src: "com.android.cellbroadcastservice.xml", + installable: true, } prebuilt_etc { |