From 55446bf371df1a297863f2a038f1b70bbf510ba5 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 21 Apr 2022 23:35:02 +0900 Subject: [PATCH] universal7885: Inherit makefile changes * A10-arm64 renamed to A10 * Inherit universal7885-common always Change-Id: Id757b775c9f58ee03d6f1266d72b13e6b2341675 Signed-off-by: roynatech2544 --- a10/device.mk | 2 +- universal7885-common/universal7885-common.mk | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/a10/device.mk b/a10/device.mk index 68008aa..548f317 100644 --- a/a10/device.mk +++ b/a10/device.mk @@ -6,7 +6,7 @@ TARGET_BOARD_HAS_FP := false # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) -$(call inherit-product, vendor/samsung/a10-arm64/a10-vendor.mk) +$(call inherit-product, vendor/samsung/a10/a10-vendor.mk) $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 47c9a38..951131d 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -1,9 +1,5 @@ # Call proprietary blob setup -ifneq ($(findstring a20, $(TARGET_PRODUCT)),) $(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk) -else ifneq ($(findstring a40, $(TARGET_PRODUCT)),) -$(call inherit-product, vendor/samsung/universal7904-common/universal7904-common-vendor.mk) -endif # Build Fingerprints $(call inherit-product, $(LOCAL_PATH)/fingerprint.mk)