summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Sarode <sgaurav@google.com>2022-05-11 18:29:29 -0700
committerGaurav Sarode <sgaurav@google.com>2022-05-16 20:55:03 +0000
commit64a454540d11daa998b359d74589c0bfd4450e63 (patch)
tree3ce61bf0f3d9a942d40f78af5d035dedfbb10890
parentc46da73effa29f52feeaaed947f6d30878fbfd2e (diff)
downloadgoogle_car-64a454540d11daa998b359d74589c0bfd4450e63.tar.gz
Add check for 64bit devices
bug: 230910673 Test: local build Change-Id: Iac2af1266e9fd4bf08eb1b01641e193921bb2ab2 (cherry picked from commit 594200a8334347d70dfac5db5da09155a4ac9de5) Merged-In: Iac2af1266e9fd4bf08eb1b01641e193921bb2ab2
-rw-r--r--common/pre_google_car.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk
index 8f6c9e6..7cb6379 100644
--- a/common/pre_google_car.mk
+++ b/common/pre_google_car.mk
@@ -28,8 +28,10 @@ PRODUCT_ENFORCE_RRO_TARGETS :=
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false
# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+# Skip this for 64 bit only devices
+ifneq ($(DEVICE_IS_64BIT_ONLY),true)
+ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+endif
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
#