commit 65200e83c21fde45d3d52418ee2fc0cfac4e51cd
author Anton Hansson <hansson@google.com> Tue Jan 15 05:46:52 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 05:46:52 2019 -0800
tree 05de90e573e537b8b41dc1265527756629271307
parent 530a86ef3aec799b7fc4209489ab355320a30f2c
parent 65f8be9940c18ede57c39da5f401acdbf33865ac

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

Change-Id: I17785c22cfed23ee492d63f8b060e978bffdc346

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,