omni: cleanup system partition
move custom things into system_ext or product
cleanup obsolete priv-app permissions
Change-Id: I321271fa2aa5b860252c9db2b1e154684d89a31e
diff --git a/config/common.mk b/config/common.mk
index 6b21d99..8f749c1 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -3,10 +3,12 @@
# use specific resolution for bootanimation
ifneq ($(TARGET_BOOTANIMATION_SIZE),)
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/bootanimation/res/$(TARGET_BOOTANIMATION_SIZE).zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip
+ vendor/omni/prebuilt/bootanimation/res/$(TARGET_BOOTANIMATION_SIZE).zip:$(TARGET_COPY_OUT_PRODUCT)/media/bootanimation.zip \
+ vendor/omni/prebuilt/bootanimation/res/$(TARGET_BOOTANIMATION_SIZE).zip:$(TARGET_COPY_OUT_PRODUCT)/media/bootanimation-dark.zip
else
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/bootanimation/bootanimation.zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip
+ vendor/omni/prebuilt/bootanimation/bootanimation.zip:$(TARGET_COPY_OUT_PRODUCT)/media/bootanimation.zip \
+ vendor/omni/prebuilt/bootanimation/bootanimation.zip:$(TARGET_COPY_OUT_PRODUCT)/media/bootanimation-dark.zip
endif
ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
@@ -41,25 +43,22 @@
#OMNI_PRODUCT_PROPERTIES += \
ro.control_privapp_permissions=enforce
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/common/bin/clean_cache.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/clean_cache.sh
-
# Backup Tool
-ifeq ($(AB_OTA_UPDATER),true)
-PRODUCT_COPY_FILES += \
+#ifeq ($(AB_OTA_UPDATER),true)
+#PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/common/bin/backuptool_ab.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.sh \
vendor/omni/prebuilt/common/bin/backuptool_ab.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.functions \
vendor/omni/prebuilt/common/bin/backuptool_postinstall.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_postinstall.sh
-else
-PRODUCT_COPY_FILES += \
+#else
+#PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/common/bin/50-hosts.sh:system/addon.d/50-hosts.sh \
vendor/omni/prebuilt/common/bin/backuptool.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.sh \
vendor/omni/prebuilt/common/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions
-endif
+#endif
# Backup Services whitelist
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/sysconfig/backup.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/backup.xml
+ vendor/omni/prebuilt/etc/sysconfig/backup.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/backup.xml
# bg excemption whitelist
PRODUCT_COPY_FILES += \
@@ -67,15 +66,11 @@
# Init script file with omni extras
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.local.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/init.omni.rc
+ vendor/omni/prebuilt/etc/init.local.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.omni.rc
# Enable SIP and VoIP on all targets
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.sip.voip.xml
-
-#permissions
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-omni.xml
+ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/android.software.sip.voip.xml
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-omni-ext.xml
@@ -101,14 +96,6 @@
vendor/omni/prebuilt/sounds/omni_unlock_phone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/omni_unlock_phone.ogg \
vendor/omni/prebuilt/sounds/omni_charge_start.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg
-# mkshrc
-#PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/mkshrc:$(TARGET_COPY_OUT_SYSTEM)/etc/mkshrc
-
-# whitelist packages for location providers not in $(TARGET_COPY_OUT_SYSTEM)
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.services.whitelist.packagelist=com.google.android.gms
-
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml
diff --git a/prebuilt/etc/permissions/privapp-permissions-omni.xml b/prebuilt/etc/permissions/privapp-permissions-omni.xml
index 16a6e8e..4d4f8e0 100644
--- a/prebuilt/etc/permissions/privapp-permissions-omni.xml
+++ b/prebuilt/etc/permissions/privapp-permissions-omni.xml
@@ -1,39 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<permissions>
- <privapp-permissions package="android.ext.services">
- <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
- </privapp-permissions>
-
- <privapp-permissions package="com.android.apps.tag">
- <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
- </privapp-permissions>
-
- <!-- Additional permissions on top of privapp-permissions-platform.xml -->
- <privapp-permissions package="com.android.dialer">
- <permission name="android.permission.STATUS_BAR"/>
- </privapp-permissions>
-
- <!-- Additional permissions on top of privapp-permissions-platform.xml -->
- <privapp-permissions package="com.android.launcher3">
- <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
- </privapp-permissions>
-
- <!-- Additional permissions on top of privapp-permissions-platform.xml -->
- <privapp-permissions package="com.android.phone">
- <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
- </privapp-permissions>
-
- <!-- Additional permissions on top of privapp-permissions-platform.xml -->
- <privapp-permissions package="com.android.systemui">
- <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
- </privapp-permissions>
-
- <privapp-permissions package="com.google.android.apps.turbo">
- <permission name="android.permission.BATTERY_STATS"/>
- <permission name="android.permission.DUMP"/>
- <permission name="android.permission.INTERACT_ACROSS_USERS"/>
- <permission name="android.permission.READ_LOGS"/>
- <permission name="android.permission.REBOOT"/>
- </privapp-permissions>
</permissions>