Merge "Move SystemUI and its permissions to /product"

am: cbf9996036

Change-Id: Ib86836b54207d5450bb98b9ade00aa6b0a22c342

CleanSpec.mk

@@ -249,6 +249,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.locati
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
+$(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
 # ******************************************************************

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)
 

packages/SystemUI/Android.bp

@@ -80,6 +80,7 @@ android_app {
     ],
 
     platform_apis: true,
+    product_specific: true,
     certificate: "platform",
     privileged: true,