diff options
| author | 2019-12-05 04:09:20 +0000 | |
|---|---|---|
| committer | 2019-12-05 04:09:20 +0000 | |
| commit | 93b3b42b65bdae2d1099145b93beeb4018300a5a (patch) | |
| tree | 953693e3d9d7dc330536577929089f335fe3c8da | |
| parent | 3fcd72ed0a388dc2de96ae23036d65c91732d7d9 (diff) | |
| parent | a8eb85afb4590a2869d1fb28cc741bea1e6b5292 (diff) | |
Merge "Move 'privapp_whitelist_com.android.settings' to system_ext"
| -rw-r--r-- | data/etc/Android.bp | 2 | ||||
| -rw-r--r-- | data/etc/CleanSpec.mk | 2 |
2 files changed, 3 insertions, 1 deletions
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 # ****************************************************************** |