From 221f4d46141427385c00f7d825b072d9ca7f32e8 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 15 Jan 2019 10:11:16 +0000
Subject: [PATCH] Move a set of app privapp grants to /product

These apps are moving to /product, so move the grant
files to /product as well.

Bug: 122353713
Test: make
Test: boot aosp product
Change-Id: Ief20d30ddb834a63cec8ed070022bb5165e07497
---
 data/etc/Android.bp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 91fe64bec0d1e..6ce81481c1d7f 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,