diff options
| author | 2019-01-15 06:06:06 -0800 | |
|---|---|---|
| committer | 2019-01-15 06:06:06 -0800 | |
| commit | ea2ee8d2ba92d5934d0e9ab1a21aa9cc55c17f46 (patch) | |
| tree | 9204bf7e39ad59cf096c66dd1978e9d3bf61d360 | |
| parent | 2dd31acf427ece308e4ed671762b738d4ddfc022 (diff) | |
| parent | 65200e83c21fde45d3d52418ee2fc0cfac4e51cd (diff) | |
Merge "Move a set of app privapp grants to /product" am: 65f8be9940
am: 65200e83c2
Change-Id: If1fc81104d65caa2a03d6763ec7df01a42df0cad
| -rw-r--r-- | data/etc/Android.bp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 91fe64bec0d1..6ce81481c1d7 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -40,17 +40,13 @@ prebuilt_etc { sub_dir: "permissions", src: "privapp-permissions-platform.xml", required: [ - "privapp_whitelist_com.android.carrierconfig", - "privapp_whitelist_com.android.contacts", - "privapp_whitelist_com.android.launcher3", - "privapp_whitelist_com.android.provision", "privapp_whitelist_com.android.settings.intelligence", - "privapp_whitelist_com.android.storagemanager", ], } prebuilt_etc { name: "privapp_whitelist_com.android.carrierconfig", + product_specific: true, sub_dir: "permissions", src: "com.android.carrierconfig.xml", filename_from_src: true, @@ -58,6 +54,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.contacts", + product_specific: true, sub_dir: "permissions", src: "com.android.contacts.xml", filename_from_src: true, @@ -65,6 +62,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.launcher3", + product_specific: true, sub_dir: "permissions", src: "com.android.launcher3.xml", filename_from_src: true, @@ -72,6 +70,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.provision", + product_specific: true, sub_dir: "permissions", src: "com.android.provision.xml", filename_from_src: true, @@ -94,6 +93,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.storagemanager", + product_specific: true, sub_dir: "permissions", src: "com.android.storagemanager.xml", filename_from_src: true, |