From edd61059d82693cab28c2b4724ebbcfbc7538b9f Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 15 Jan 2019 10:17:44 +0000
Subject: [PATCH] Move settings intelligence grant file to /product

The app is moving to /product, so move its privapp permission
grant along with it.

Bug: 122353713
Test: make
Test: boot aosp product
Change-Id: Ib4041ac5e39fa037939326db9c858db78d31d51b
---
 data/etc/Android.bp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 6ce81481c1d7f..035ee108c6da7 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -39,9 +39,6 @@ prebuilt_etc {
     name: "privapp-permissions-platform.xml",
     sub_dir: "permissions",
     src: "privapp-permissions-platform.xml",
-    required: [
-        "privapp_whitelist_com.android.settings.intelligence",
-    ],
 }
 
 prebuilt_etc {
@@ -86,6 +83,7 @@ prebuilt_etc {
 
 prebuilt_etc {
     name: "privapp_whitelist_com.android.settings.intelligence",
+    product_specific: true,
     sub_dir: "permissions",
     src: "com.android.settings.intelligence.xml",
     filename_from_src: true,