From 056b9c7bc8cb07ca7ca96b786ae1681cd94cc6d0 Mon Sep 17 00:00:00 2001 From: FraSharp Date: Sat, 5 Feb 2022 09:19:10 +0100 Subject: [PATCH] exynos7885: common: cleanup makefiles Signed-off-by: FraSharp --- universal7885-common/Android.mk | 2 +- universal7885-common/BoardConfigCommon.mk | 2 +- universal7885-common/universal7885-common.mk | 25 ++++++++++---------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/universal7885-common/Android.mk b/universal7885-common/Android.mk index 37763ab..c5a9a9f 100644 --- a/universal7885-common/Android.mk +++ b/universal7885-common/Android.mk @@ -21,7 +21,7 @@ $(VULKAN64_SYMLINK): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += \ $(VULKAN_SYMLINK) \ $(VULKAN64_SYMLINK) - + include $(CLEAR_VARS) VULKAN_SYMLINK := $(TARGET_OUT_VENDOR)/lib/hw/vulkan.universal7904.so diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index bd7a1b5..f73666c 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -89,7 +89,7 @@ BOARD_ROOT_EXTRA_FOLDERS := factory # Sepolicy SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += \ $(COMMON_PATH)/sepolicy/public - + BOARD_VENDOR_SEPOLICY_DIRS += \ $(COMMON_PATH)/sepolicy/vendor diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 6a6a5f9..1a08c4b 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -33,14 +33,14 @@ PRODUCT_PACKAGES += \ audio.r_submix.default \ audio.usb.default \ audio.hearing_aid.default - + # Audio (BT) PRODUCT_PACKAGES += \ android.hardware.bluetooth.audio@2.1-impl \ audio.bluetooth.default \ - audio.a2dp.default + audio.a2dp.default -# Audio Configs +# Audio Configs PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ $(LOCAL_PATH)/configs/audio/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ @@ -64,7 +64,7 @@ PRODUCT_COPY_FILES += \ # Camera PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.5-service - + # Camera app PRODUCT_PACKAGES += \ Footej @@ -113,7 +113,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl \ libgui_vendor - + # Health PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl \ @@ -146,7 +146,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.keymaster@4.0-service.samsung \ libkeymaster4_1support.vendor - + # Light PRODUCT_PACKAGES += \ android.hardware.light-service.samsung @@ -155,8 +155,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ 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_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ - + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml + # Memtrack PRODUCT_PACKAGES += \ android.hardware.memtrack@1.0-impl \ @@ -227,7 +227,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - $(LOCAL_PATH)/configs/permissions/platform-samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/platform-samsung.xml \ + $(LOCAL_PATH)/configs/permissions/platform-samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/platform-samsung.xml # Power PRODUCT_PACKAGES += \ @@ -248,7 +248,7 @@ PRODUCT_COPY_FILES += \ # Nuke Useless Apps (Mostly GAPPS) PRODUCT_PACKAGES += \ RemovePkgs - + # Notch PRODUCT_PACKAGES += \ NotchBarKiller \ @@ -278,7 +278,7 @@ PRODUCT_COPY_FILES += \ # Sensors PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl.samsung \ - libsensorndkbridge + libsensorndkbridge # Shims PRODUCT_PACKAGES += \ @@ -324,7 +324,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ $(LOCAL_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \ $(LOCAL_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf - + PRODUCT_CFI_INCLUDE_PATHS += hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib # SamsungParts @@ -340,4 +340,3 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ sgdisk \ strace -