StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Android builds default to 64-bit." into main am: 48c53d600e

Browse Source 
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:
Steven Moreland
2024-06-03 18:37:07 +00:00
committed by Automerger Merge Worker
parent c284f8c8d2 48c53d600e
commit 066ad556ab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/envsetup.mk
View File

@@ -82,7 +82,7 @@ CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 13
# --------------------------------------------------------------- # ---------------------------------------------------------------
# The product defaults to generic on hardware # The product defaults to generic on hardware
ifeq ($(TARGET_PRODUCT),) ifeq ($(TARGET_PRODUCT),)
TARGET_PRODUCT := aosp_arm TARGET_PRODUCT := aosp_arm64
endif endif

2
target/product/aosp_arm64.mk
View File

@@ -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) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
# pKVM # 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 # All components inherited here go to product image