From a8eb85afb4590a2869d1fb28cc741bea1e6b5292 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Wed, 4 Dec 2019 12:35:08 +0900 Subject: Move 'privapp_whitelist_com.android.settings' to system_ext As Settings is moved to system_ext, its permission files will follow the app location. Test: m Bug: 137908189 Change-Id: I58ae29a6454f91f222b15ccbd9d3e5b5d5889289 --- data/etc/Android.bp | 2 +- data/etc/CleanSpec.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/etc/Android.bp b/data/etc/Android.bp index c49d663c52eb..ff521be82599 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -104,7 +104,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.settings", - product_specific: true, + system_ext_specific: true, sub_dir: "permissions", src: "com.android.settings.xml", filename_from_src: true, diff --git a/data/etc/CleanSpec.mk b/data/etc/CleanSpec.mk index cffb1babfc08..3fe421e530cb 100644 --- a/data/etc/CleanSpec.mk +++ b/data/etc/CleanSpec.mk @@ -49,6 +49,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.emergency.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.provision.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.provision.xml) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.settings.xml) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.settings.xml) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** -- cgit v1.2.3-59-g8ed1b