From 09ef796bb76aafcd5daadbf43dad5f5340b9f69a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 14 Nov 2021 18:12:26 +0200 Subject: [PATCH] config: Move permissions & sysconfig to /product Change-Id: Ie2733b03b72fa01f89d2c978e978a13329ded814 --- config/common.mk | 8 ++++---- config/lineage_sdk_common.mk | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/common.mk b/config/common.mk index 22ce832a..8570aa52 100644 --- a/config/common.mk +++ b/config/common.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # Lineage-specific broadcast actions whitelist PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lineage-sysconfig.xml + vendor/lineage/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/lineage-sysconfig.xml # Lineage-specific init rc file PRODUCT_COPY_FILES += \ @@ -55,11 +55,11 @@ PRODUCT_COPY_FILES += \ # Enable Android Beam on all targets PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/android.software.nfc.beam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.nfc.beam.xml + vendor/lineage/config/permissions/android.software.nfc.beam.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.software.nfc.beam.xml # Enable SIP+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 + frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.software.sip.voip.xml # Enable wireless Xbox 360 controller support PRODUCT_COPY_FILES += \ @@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \ # This is Lineage! PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml + vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml # Enforce privapp-permissions whitelist PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ diff --git a/config/lineage_sdk_common.mk b/config/lineage_sdk_common.mk index db407c80..49a0212b 100644 --- a/config/lineage_sdk_common.mk +++ b/config/lineage_sdk_common.mk @@ -1,13 +1,13 @@ # Permissions for lineage sdk services PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/org.lineageos.audio.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.audio.xml \ - vendor/lineage/config/permissions/org.lineageos.globalactions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.globalactions.xml \ - vendor/lineage/config/permissions/org.lineageos.hardware.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.hardware.xml \ - vendor/lineage/config/permissions/org.lineageos.livedisplay.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.livedisplay.xml \ - vendor/lineage/config/permissions/org.lineageos.performance.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.performance.xml \ - vendor/lineage/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.profiles.xml \ - vendor/lineage/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.settings.xml \ - vendor/lineage/config/permissions/org.lineageos.trust.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.trust.xml + vendor/lineage/config/permissions/org.lineageos.audio.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.audio.xml \ + vendor/lineage/config/permissions/org.lineageos.globalactions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.globalactions.xml \ + vendor/lineage/config/permissions/org.lineageos.hardware.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.hardware.xml \ + vendor/lineage/config/permissions/org.lineageos.livedisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.livedisplay.xml \ + vendor/lineage/config/permissions/org.lineageos.performance.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.performance.xml \ + vendor/lineage/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.profiles.xml \ + vendor/lineage/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.settings.xml \ + vendor/lineage/config/permissions/org.lineageos.trust.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.trust.xml # Lineage Platform Library PRODUCT_PACKAGES += \