Move tangor to 64-bit only

Bug: 213924541
Test: Build
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I8e237ab1bf387608331375bee18dbf9b4912e5c1
This commit is contained in:
Pat Tjin 2022-01-11 15:10:07 -08:00 committed by TreeHugger Robot
parent a3737c7b08
commit dae7d3ea02
3 changed files with 5 additions and 4 deletions

View file

@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_VARIANT := cortex-a55 TARGET_CPU_VARIANT := cortex-a55
TARGET_CPU_VARIANT_RUNTIME := cortex-a55 TARGET_CPU_VARIANT_RUNTIME := cortex-a55
ifeq (,$(filter %_64,$(TARGET_PRODUCT))) ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
TARGET_2ND_ARCH := arm TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI := armeabi-v7a

View file

@ -17,11 +17,12 @@
# #
# All components inherited here go to system image # All components inherited here go to system image
# #
ifeq (,$(filter %_64,$(TARGET_PRODUCT))) ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
else else
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
endif endif
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
# Enable CSI checking # Enable CSI checking

View file

@ -18,7 +18,7 @@ include device/google/gs-common/device.mk
TARGET_BOARD_PLATFORM := gs101 TARGET_BOARD_PLATFORM := gs101
ifneq (,$(filter %_64,$(TARGET_PRODUCT))) ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
LOCAL_64ONLY := _64 LOCAL_64ONLY := _64
endif endif
@ -899,7 +899,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
endif endif
ifeq (,$(filter %_64,$(TARGET_PRODUCT))) ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
else else
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)