diff options
author | Anton Hansson <hansson@google.com> | 2018-12-10 17:18:15 +0000 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2018-12-18 10:33:56 +0000 |
commit | 9068f65e4f72792fdb579862ceb01b6a390a56a0 (patch) | |
tree | 62183fa56cd3252b0b7e6108fd3c3bf3a4535831 | |
parent | 29ca21ba8ed11ef369d8047da6dad1b05e798486 (diff) |
Move SystemUI and its permissions to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.
Bug: 110072687
Test: make
Test: boot blueline
Test: atest SystemUITests
Change-Id: If27bcccd62f239f716db5ee7f4f1418d936e1cf4
-rw-r--r-- | CleanSpec.mk | 1 | ||||
-rw-r--r-- | data/etc/Android.mk | 1 | ||||
-rw-r--r-- | packages/SystemUI/Android.bp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 478e4fe86d3b..d01e183df84d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -251,6 +251,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/overlay/ExperimentNavigationBarSlim) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNavigationBarSlim) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** diff --git a/data/etc/Android.mk b/data/etc/Android.mk index 61ef426f510a..994a6724758b 100644 --- a/data/etc/Android.mk +++ b/data/etc/Android.mk @@ -63,6 +63,7 @@ LOCAL_MODULE := privapp_whitelist_com.android.systemui LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_RELATIVE_PATH := permissions LOCAL_MODULE_STEM := com.android.systemui.xml +LOCAL_PRODUCT_MODULE := true LOCAL_SRC_FILES := com.android.systemui.xml include $(BUILD_PREBUILT) diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index c2e107a06692..ad44b9a1ee9f 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -134,6 +134,7 @@ android_app { ], platform_apis: true, + product_specific: true, certificate: "platform", privileged: true, |