commit dae7d3ea02eb4617d0274c94d786c42e8a4969d2
author Pat Tjin <pattjin@google.com> Tue Jan 11 15:10:07 2022 -0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 12 21:44:31 2022 +0000
tree fa8263552ad12ff202025f8720bd9d4e1a84425d
parent a3737c7b08b68b9ff64c9ab716a5831bc294014f

Move tangor to 64-bit only

Bug: 213924541
Test: Build
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I8e237ab1bf387608331375bee18dbf9b4912e5c1

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ce7c0b7..b065cf7 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,7 +32,7 @@
 TARGET_CPU_VARIANT := 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_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a

aosp_common.mk

diff --git a/aosp_common.mk b/aosp_common.mk
index 1ad6eb7..e4e6863 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -17,11 +17,12 @@
 #
 # 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)
 else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 endif
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
 
 # Enable CSI checking

device.mk

diff --git a/device.mk b/device.mk
index 6eef600..b4d31b9 100644
--- a/device.mk
+++ b/device.mk
@@ -18,7 +18,7 @@
 
 TARGET_BOARD_PLATFORM := gs101
 
-ifneq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 LOCAL_64ONLY := _64
 endif
 
@@ -899,7 +899,7 @@
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 endif
 
-ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
+ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)