From a3a24dee1c9a3e59dfa86db0317452343863d796 Mon Sep 17 00:00:00 2001
From: Wally Yau <wyau@google.com>
Date: Tue, 4 Jun 2019 08:20:46 -0700
Subject: Remove dependency on files from vendor

Created a priv-app permissions file specifically for ATV GSI
in the device/google/atv directory.

Bug: 134305933
Test: lunch aosp_atv_arm_ab-userdebug && make -j 32
      lunch aosp_atv_arm64_ab-userdebug && make -j 32

Change-Id: Ifb238ceafe28089c21004c70387ae855bbb630f5
---
 permissions/privapp-permissions-atv-gsi.xml | 41 +++++++++++++++++++++++++++++
 products/treble_atv_common.mk               |  8 ++----
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 permissions/privapp-permissions-atv-gsi.xml

diff --git a/permissions/privapp-permissions-atv-gsi.xml b/permissions/privapp-permissions-atv-gsi.xml
new file mode 100644
index 0000000..92550a9
--- /dev/null
+++ b/permissions/privapp-permissions-atv-gsi.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.android.connectivity.metrics">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.tv.provision">
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.tv.settings">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.DELETE_CACHE_FILES"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.SET_TIME_ZONE"/>
+        <permission name="android.permission.USE_RESERVED_DISK"/>
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.tv">
+        <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/>
+        <permission name="android.permission.DVB_DEVICE"/>
+        <permission name="android.permission.HDMI_CEC"/>
+        <permission name="android.permission.MODIFY_PARENTAL_CONTROLS"/>
+        <permission name="android.permission.READ_CONTENT_RATING_SYSTEMS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.example.sampleleanbacklauncher">
+        <permission name="android.permission.ACCESS_NOTIFICATIONS"/>
+    </privapp-permissions>
+</permissions>
diff --git a/products/treble_atv_common.mk b/products/treble_atv_common.mk
index b01ac86..c7d64ce 100644
--- a/products/treble_atv_common.mk
+++ b/products/treble_atv_common.mk
@@ -62,10 +62,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     netutils-wrapper-1.0
 
-# Support for the devices with no VNDK enforcing
 PRODUCT_COPY_FILES += \
-    build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \
-    build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.rc
+    build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc
 
 # Name space configuration file for non-enforcing VNDK
 PRODUCT_PACKAGES += \
@@ -77,6 +75,4 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 
 # privapp-permissions whitelisting
 PRODUCT_COPY_FILES += \
-    vendor/google/data/etc/permissions/privapp-permissions-atv.xml:system/etc/permissions/privapp-permissions-atv.xml
-
-$(call inherit-product, vendor/google/data/etc/permissions/privapp-permissions-google.mk)
+    device/google/atv/permissions/privapp-permissions-atv-gsi.xml:system/etc/permissions/privapp-permissions-atv-gsi.xml
-- 
cgit v1.2.3