universal7885: add local arch variable

This commit is contained in:
Gabriel2392 2022-07-30 09:33:09 -03:00
commit c0e70c1f68
8 changed files with 14 additions and 2 deletions

View file

@ -2,6 +2,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_BOARD_CAMERA_COUNT := 2 TARGET_BOARD_CAMERA_COUNT := 2
TARGET_BOARD_HAS_FP := false TARGET_BOARD_HAS_FP := false
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -2,6 +2,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_BOARD_CAMERA_COUNT := 2 TARGET_BOARD_CAMERA_COUNT := 2
TARGET_BOARD_HAS_FP := false TARGET_BOARD_HAS_FP := false
TARGET_LOCAL_ARCH := arm
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
TARGET_LOCAL_ARCH := arm64
# Inherit common device configuration # Inherit common device configuration
$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk) $(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)

View file

@ -1,5 +1,5 @@
# Call proprietary blob setup # Call proprietary blob setup
ifeq ($(TARGET_ARCH),arm64) ifeq ($(TARGET_LOCAL_ARCH),arm64)
$(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk) $(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk)
endif endif
@ -291,7 +291,7 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so 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 += \ PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so
endif endif