diff options
| author | Gina Ko <yichunko@google.com> | 2022-02-25 17:05:22 -0800 |
|---|---|---|
| committer | Gina Ko <yichunko@google.com> | 2022-03-14 16:44:25 +0000 |
| commit | 18bd11a39e5f48ff74386269d2628415c213fa18 (patch) | |
| tree | d1232da100a9fd508670f5819b701b5e3c602231 /aosp_common.mk | |
| parent | 30c3ddacc7b9faec9045d73cfb803fbb9f40e44f (diff) | |
| download | gs101-18bd11a39e5f48ff74386269d2628415c213fa18.tar.gz | |
Refactor conditional to use DEVICE_IS_64BIT_ONLY
Bug: 218458605
Bug: 223622655
Signed-off-by: Gina Ko <yichunko@google.com>
Change-Id: Ia74ef39ab8433d036925a30217f49da8f6fd863b
Diffstat (limited to 'aosp_common.mk')
| -rw-r--r-- | aosp_common.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/aosp_common.mk b/aosp_common.mk index 57d67225..8788251a 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) |