From 38ed7d7410ed4da074c6a4f4f0c19962102360ae Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Tue, 26 Nov 2019 16:11:54 +0900 Subject: [PATCH] privapp_whitelist_com.android.emergency to system_ext Test: m Bug: 137908189 Change-Id: I50c04967fb5a3e4f3227b50d750f24d3d8deeec4 --- 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 dd4f238cbed8c..45544d8752dbe 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -73,7 +73,7 @@ prebuilt_etc { prebuilt_etc { name: "privapp_whitelist_com.android.emergency", - product_specific: true, + system_ext_specific: true, sub_dir: "permissions", src: "com.android.emergency.xml", filename_from_src: true, diff --git a/data/etc/CleanSpec.mk b/data/etc/CleanSpec.mk index be10a2c9c8af6..0d49ae478a010 100644 --- a/data/etc/CleanSpec.mk +++ b/data/etc/CleanSpec.mk @@ -45,6 +45,8 @@ #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.carrierconfig.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.carrierconfig.xml) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.emergency.xml) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.emergency.xml) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ******************************************************************