From c0e70c1f68bade90e3d30d1828a9e5ba956796fd Mon Sep 17 00:00:00 2001 From: Gabriel2392 Date: Sat, 30 Jul 2022 09:33:09 -0300 Subject: [PATCH] universal7885: add local arch variable --- a10/device.mk | 1 + a10dd/device.mk | 1 + a20/device.mk | 2 ++ a20e/device.mk | 2 ++ a30/device.mk | 2 ++ a30s/device.mk | 2 ++ a40/device.mk | 2 ++ universal7885-common/universal7885-common.mk | 4 ++-- 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/a10/device.mk b/a10/device.mk index cc60b03..e346923 100644 --- a/a10/device.mk +++ b/a10/device.mk @@ -2,6 +2,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_BOARD_CAMERA_COUNT := 2 TARGET_BOARD_HAS_FP := false +TARGET_LOCAL_ARCH := arm64 # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a10dd/device.mk b/a10dd/device.mk index 0bc42c8..d03d0d0 100644 --- a/a10dd/device.mk +++ b/a10dd/device.mk @@ -2,6 +2,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay TARGET_BOARD_CAMERA_COUNT := 2 TARGET_BOARD_HAS_FP := false +TARGET_LOCAL_ARCH := arm # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a20/device.mk b/a20/device.mk index f029837..b0ae87e 100644 --- a/a20/device.mk +++ b/a20/device.mk @@ -1,5 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_LOCAL_ARCH := arm64 + # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a20e/device.mk b/a20e/device.mk index 17ab241..b6953fa 100644 --- a/a20e/device.mk +++ b/a20e/device.mk @@ -1,5 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_LOCAL_ARCH := arm64 + # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a30/device.mk b/a30/device.mk index fd19e16..bd8588a 100644 --- a/a30/device.mk +++ b/a30/device.mk @@ -1,5 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_LOCAL_ARCH := arm64 + # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a30s/device.mk b/a30s/device.mk index c202128..9d34b4a 100644 --- a/a30s/device.mk +++ b/a30s/device.mk @@ -1,5 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_LOCAL_ARCH := arm64 + # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/a40/device.mk b/a40/device.mk index 07a166e..119ba16 100644 --- a/a40/device.mk +++ b/a40/device.mk @@ -1,5 +1,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +TARGET_LOCAL_ARCH := arm64 + # Inherit common device configuration $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 72d5295..1279f4a 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -1,5 +1,5 @@ # Call proprietary blob setup -ifeq ($(TARGET_ARCH),arm64) +ifeq ($(TARGET_LOCAL_ARCH),arm64) $(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk) endif @@ -291,7 +291,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so -ifeq ($(TARGET_ARCH),arm64) +ifeq ($(TARGET_LOCAL_ARCH),arm64) PRODUCT_COPY_FILES += \ prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so endif