commit 16070dc687d10609b7f3760dc8550a5949530660
author maxwen <max.weninger@gmail.com> Tue Apr 12 21:43:36 2022 +0200
committer Max Weninger <max.weninger@gmail.com> Thu Apr 14 15:27:44 2022 +0100
tree 0d7d7a9c0a15a4d7642ef4b64e66e3678e4c7399
parent 28123405d12abc3d60c394db635c1198fd7924a9

omni: use TARGET_COPY_OUT_SYSTEM instead of system/

Change-Id: Iedd3044e0e747a9b8ffe2cb4c8648035655af3aa

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 0fe2d20..89ed132 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -3,10 +3,10 @@
 # use specific resolution for bootanimation
 ifneq ($(TARGET_BOOTANIMATION_SIZE),)
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bootanimation/res/$(TARGET_BOOTANIMATION_SIZE).zip:system/media/bootanimation.zip
+    vendor/omni/prebuilt/bootanimation/res/$(TARGET_BOOTANIMATION_SIZE).zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip
 else
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bootanimation/bootanimation.zip:system/media/bootanimation.zip
+    vendor/omni/prebuilt/bootanimation/bootanimation.zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
@@ -42,41 +42,41 @@
     ro.control_privapp_permissions=enforce
 
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bin/clean_cache.sh:system/bin/clean_cache.sh
+    vendor/omni/prebuilt/bin/clean_cache.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/clean_cache.sh
 
 # Backup Tool
 ifeq ($(AB_OTA_UPDATER),true)
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/common/bin/backuptool_ab.sh:system/bin/backuptool_ab.sh \
-    vendor/omni/prebuilt/common/bin/backuptool_ab.functions:system/bin/backuptool_ab.functions \
-    vendor/omni/prebuilt/common/bin/backuptool_postinstall.sh:system/bin/backuptool_postinstall.sh
+    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
 ifeq ($(filter $(ROM_BUILDTYPE), GAPPS MICROG),)
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/addon.d/69-gapps.sh:system/addon.d/69-gapps.sh
+    vendor/omni/prebuilt/addon.d/69-gapps.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/69-gapps.sh
 endif
 else
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/omni/prebuilt/bin/backuptool.functions:system/bin/backuptool.functions \
-    vendor/omni/prebuilt/bin/blacklist:system/addon.d/blacklist
+    vendor/omni/prebuilt/bin/backuptool.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.sh \
+    vendor/omni/prebuilt/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions \
+    vendor/omni/prebuilt/bin/blacklist:$(TARGET_COPY_OUT_SYSTEM)/addon.d/blacklist
 endif
 
 # Backup Services whitelist
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/etc/sysconfig/backup.xml:system/etc/sysconfig/backup.xml
+    vendor/omni/prebuilt/etc/sysconfig/backup.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/backup.xml
 
 # Init script file with omni extras
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/etc/init.local.rc:system/etc/init/init.omni.rc
+    vendor/omni/prebuilt/etc/init.local.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/init.omni.rc
 
 # Enable SIP and VoIP on all targets
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
+    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:system/etc/permissions/privapp-permissions-omni.xml \
-    vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:system/etc/sysconfig/omni-power-whitelist.xml
+    vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-omni.xml \
+    vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/omni-power-whitelist.xml
 
 # custom omni sounds
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -101,9 +101,9 @@
 
 # mkshrc
 #PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/etc/mkshrc:system/etc/mkshrc
+    vendor/omni/prebuilt/etc/mkshrc:$(TARGET_COPY_OUT_SYSTEM)/etc/mkshrc
 
-# whitelist packages for location providers not in system
+# whitelist packages for location providers not in $(TARGET_COPY_OUT_SYSTEM)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.services.whitelist.packagelist=com.google.android.gms