commit 13dd25747fb608dcd5a56025d204e782dbd93ac2
author Anton Hansson <hansson@google.com> Tue Jan 15 06:19:02 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 06:19:02 2019 -0800
tree 934d9a4ad598de79c53d73baf8642d6ea639f236
parent d231ab271c04d8742e1c7f4b40f5d4bf89710a47
parent ea2ee8d2ba92d5934d0e9ab1a21aa9cc55c17f46

Merge "Move a set of app privapp grants to /product" am: 65f8be9940 am: 65200e83c2
am: ea2ee8d2ba

Change-Id: Ie01d987cbc547424cee7d82d2ebc54192f492e4d

data/etc/Android.bp

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 91fe64b..6ce8148 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -40,17 +40,13 @@
     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 {
     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 {
     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 {
     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 {
     name: "privapp_whitelist_com.android.storagemanager",
+    product_specific: true,
     sub_dir: "permissions",
     src: "com.android.storagemanager.xml",
     filename_from_src: true,