From fe876e78edcd5bf2bad0221ca0f291403b6c7782 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Wed, 29 Nov 2023 21:54:20 +0900 Subject: [PATCH] universal7885: Satisify EPPE requirements - Make TARGET_SOC device specific variable - Also some cleanup --- a10/common.mk | 4 +--- a10dd/vendor.prop | 2 -- a20/device.mk | 7 +++---- a20e/device.mk | 10 +++------- a30/device.mk | 4 +--- a30s/device.mk | 5 +---- a40/device.mk | 4 +--- universal7885-common/BoardConfigCommon.mk | 11 ++--------- universal7885-common/universal7885-common.mk | 4 ++-- 9 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 a10dd/vendor.prop diff --git a/a10/common.mk b/a10/common.mk index f4aaa08..360aaff 100644 --- a/a10/common.mk +++ b/a10/common.mk @@ -2,6 +2,7 @@ DEVICE_PACKAGE_OVERLAYS += device/samsung/a10/overlay TARGET_BOARD_CAMERA_COUNT := 2 TARGET_BOARD_HAS_FP := false +TARGET_SOC := exynos7884B # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) @@ -15,9 +16,6 @@ PRODUCT_PACKAGES += \ TARGET_SCREEN_HEIGHT := 1520 TARGET_SCREEN_WIDTH := 720 -PRODUCT_PACKAGES += \ - fstab.exynos7884B - BUILD_FINGERPRINT := "samsung/a10kx/a10:11/RP1A.200720.012/A105NKOU5CUL4:user/release-keys" PRODUCT_BUILD_PROP_OVERRIDES += \ diff --git a/a10dd/vendor.prop b/a10dd/vendor.prop deleted file mode 100644 index d0e7709..0000000 --- a/a10dd/vendor.prop +++ /dev/null @@ -1,2 +0,0 @@ -## Bluetooth -bluetooth.device.default_name=Galaxy A10 diff --git a/a20/device.mk b/a20/device.mk index f6cf36a..57a2781 100644 --- a/a20/device.mk +++ b/a20/device.mk @@ -1,6 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_LOCAL_ARCH := arm64 +TARGET_SOC := exynos7884B # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) @@ -17,11 +18,9 @@ TARGET_SCREEN_HEIGHT := 1560 TARGET_SCREEN_WIDTH := 720 # Fingerprint -PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml -PRODUCT_PACKAGES += \ - fstab.exynos7884B - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a20e/device.mk b/a20e/device.mk index 0860436..6ce2996 100644 --- a/a20e/device.mk +++ b/a20e/device.mk @@ -1,5 +1,6 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_SOC := exynos7884B TARGET_LOCAL_ARCH := arm64 # Inherit common device configuration @@ -9,9 +10,6 @@ $(call inherit-product, vendor/samsung/a20e/a20e-vendor.mk) $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) -# Derp -DERP_BUILDTYPE := Official - # USB PRODUCT_PACKAGES += \ android.hardware.usb-service.samsung @@ -20,10 +18,8 @@ TARGET_SCREEN_HEIGHT := 1560 TARGET_SCREEN_WIDTH := 720 # Fingerprint -PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml -PRODUCT_PACKAGES += \ - fstab.exynos7884B - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a30/device.mk b/a30/device.mk index 4fbd8a9..9d8eea9 100644 --- a/a30/device.mk +++ b/a30/device.mk @@ -1,6 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_LOCAL_ARCH := arm64 +TARGET_SOC := exynos7904 # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) @@ -21,9 +22,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml -PRODUCT_PACKAGES += \ - fstab.exynos7904 - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a30s/device.mk b/a30s/device.mk index 97c363d..d67a5d0 100644 --- a/a30s/device.mk +++ b/a30s/device.mk @@ -1,7 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_LOCAL_ARCH := arm64 -# UDFPS +TARGET_SOC := exynos7904 TARGET_HAS_UDFPS := true # Inherit common device configuration @@ -23,9 +23,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml -PRODUCT_PACKAGES += \ - fstab.exynos7904 - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a40/device.mk b/a40/device.mk index c2ef6ae..7f70be6 100644 --- a/a40/device.mk +++ b/a40/device.mk @@ -1,6 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_LOCAL_ARCH := arm64 +TARGET_SOC := exynos7904 # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) @@ -21,9 +22,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml -PRODUCT_PACKAGES += \ - fstab.exynos7904 - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index 79bcd53..aef75c1 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -3,15 +3,8 @@ COMMON_PATH := device/samsung/universal7885-common BOARD_VENDOR := samsung # Platform -ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a10dd a10 a20 a20e)) -TARGET_SOC := exynos7884B -TARGET_BOARD_PLATFORM := universal7884B -TARGET_BOOTLOADER_BOARD_NAME := exynos7884B -else ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a30 a30s a40)) -TARGET_SOC := exynos7904 -TARGET_BOARD_PLATFORM := universal7904 -TARGET_BOOTLOADER_BOARD_NAME := exynos7904 -endif +TARGET_BOARD_PLATFORM := $(subst exynos,universal,$(TARGET_SOC)) +TARGET_BOOTLOADER_BOARD_NAME := $(TARGET_SOC) include hardware/samsung_slsi-linaro/config/BoardConfig7885.mk diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 4d88261..cd1b8e9 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -140,8 +140,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.composer.hwc3-service.slsi \ - gralloc.exynos7904 \ - gralloc.exynos7884B \ + gralloc.$(TARGET_SOC) \ libion_exynos # Health @@ -160,6 +159,7 @@ PRODUCT_PACKAGES += \ # Init PRODUCT_PACKAGES += \ + fstab.$(TARGET_SOC) \ fstab.enableswap \ init.exynos7885.rc \ init.exynos7885.usb.rc \