From 5289f4b9e0241a292c0f42731028083b5354a9f7 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 25 Mar 2022 12:38:37 +0000 Subject: [PATCH] g12: Be simple and just use LOCAL_PATH var Change-Id: I74bfebb8c579560a4d212b809df70769eb13222e --- g12.mk | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/g12.mk b/g12.mk index 5e8fbd3..cb9e917 100644 --- a/g12.mk +++ b/g12.mk @@ -1,26 +1,24 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # $(call inherit-product, vendor/amlogic/g12-common/g12-common-vendor.mk) -COMMON_PATH := device/amlogic/g12-common - ## AAPT PRODUCT_AAPT_PREF_CONFIG := tvdpi ## Audio PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/audio/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ - $(COMMON_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(COMMON_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(COMMON_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(COMMON_PATH)/audio/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \ - $(COMMON_PATH)/audio/msd_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/msd_audio_policy_configuration.xml \ - $(COMMON_PATH)/audio/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \ - $(COMMON_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + $(LOCAL_PATH)/audio/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + $(LOCAL_PATH)/audio/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/msd_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/msd_audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \ + $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml @@ -70,10 +68,10 @@ PRODUCT_IS_ATV := true ## Codecs PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/media/media_codecs_sw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - $(COMMON_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(COMMON_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(COMMON_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ + $(LOCAL_PATH)/media/media_codecs_sw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ + $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml @@ -120,13 +118,13 @@ PRODUCT_PACKAGES += \ # Init-Files PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/init-files/fstab.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic \ - $(COMMON_PATH)/init-files/init.amlogic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc \ - $(COMMON_PATH)/init-files/init.amlogic.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.board.rc \ - $(COMMON_PATH)/init-files/init.amlogic.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.media.rc \ - $(COMMON_PATH)/init-files/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \ - $(COMMON_PATH)/init-files/init.recovery.amlogic.rc:recovery/root/init.recovery.amlogic.rc \ - $(COMMON_PATH)/init-files/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc + $(LOCAL_PATH)/init-files/fstab.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic \ + $(LOCAL_PATH)/init-files/init.amlogic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc \ + $(LOCAL_PATH)/init-files/init.amlogic.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.board.rc \ + $(LOCAL_PATH)/init-files/init.amlogic.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.media.rc \ + $(LOCAL_PATH)/init-files/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \ + $(LOCAL_PATH)/init-files/init.recovery.amlogic.rc:recovery/root/init.recovery.amlogic.rc \ + $(LOCAL_PATH)/init-files/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc ## Kernel Modules PRODUCT_PACKAGES += \ @@ -163,14 +161,14 @@ PRODUCT_PACKAGES += \ ## NRDP (Netflix) PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/nrdp/nrdp.xml:/vendor/etc/permissions/nrdp.xml \ - $(COMMON_PATH)/nrdp/nrdp_audio_platform_capabilities.json:/vendor/etc/permissions/nrdp_audio_platform_capabilities.json \ - $(COMMON_PATH)/nrdp/nrdp_audio_platform_capabilities_ms12.json:/vendor/etc/permissions/nrdp_audio_platform_capabilities_ms12.json \ - $(COMMON_PATH)/nrdp/nrdp_platform_capabilities.json:/vendor/etc/permissions/nrdp_platform_capabilities.json + $(LOCAL_PATH)/nrdp/nrdp.xml:/vendor/etc/permissions/nrdp.xml \ + $(LOCAL_PATH)/nrdp/nrdp_audio_platform_capabilities.json:/vendor/etc/permissions/nrdp_audio_platform_capabilities.json \ + $(LOCAL_PATH)/nrdp/nrdp_audio_platform_capabilities_ms12.json:/vendor/etc/permissions/nrdp_audio_platform_capabilities_ms12.json \ + $(LOCAL_PATH)/nrdp/nrdp_platform_capabilities.json:/vendor/etc/permissions/nrdp_platform_capabilities.json ## Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(COMMON_PATH)/overlay + $(LOCAL_PATH)/overlay PRODUCT_ENFORCE_RRO_TARGETS := * ## Partitions -- 2.20.1