commit 18bd11a39e5f48ff74386269d2628415c213fa18
author Gina Ko <yichunko@google.com> Fri Feb 25 17:05:22 2022 -0800
committer Gina Ko <yichunko@google.com> Mon Mar 14 16:44:25 2022 +0000
tree d1232da100a9fd508670f5819b701b5e3c602231
parent 30c3ddacc7b9faec9045d73cfb803fbb9f40e44f

Refactor conditional to use DEVICE_IS_64BIT_ONLY

Bug: 218458605
Bug: 223622655
Signed-off-by: Gina Ko <yichunko@google.com>
Change-Id: Ia74ef39ab8433d036925a30217f49da8f6fd863b

aosp_common.mk

diff --git a/aosp_common.mk b/aosp_common.mk
index 57d6722..8788251 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -17,10 +17,12 @@
 #
 # All components inherited here go to system image
 #
-ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-else
+DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false)
+
+ifeq ($(DEVICE_IS_64BIT_ONLY),true)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+else
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 endif
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)