Merge "Android builds default to 64-bit." into main am: 48c53d600e
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067 Change-Id: I69fb3c0342d84e5eac60e03ddce22ab350f23f81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -82,7 +82,7 @@ CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 13
|
||||
# ---------------------------------------------------------------
|
||||
# The product defaults to generic on hardware
|
||||
ifeq ($(TARGET_PRODUCT),)
|
||||
TARGET_PRODUCT := aosp_arm
|
||||
TARGET_PRODUCT := aosp_arm64
|
||||
endif
|
||||
|
||||
|
||||
|
@@ -44,7 +44,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
|
||||
|
||||
# pKVM
|
||||
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
|
||||
$(call inherit-product-if-exists, packages/modules/Virtualization/apex/product_packages.mk)
|
||||
|
||||
#
|
||||
# All components inherited here go to product image
|
||||
|
Reference in New Issue
Block a user