Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eda1eb25 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Add an aosp_arm64_plus_armv7 product for building test suites" into main am: 44f698f4 

Original change: https://android-review.googlesource.com/c/platform/build/+/3484316



Change-Id: I1fa90f99745deabbd8ac36854daf78f074fa74d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5288842a 44f698f4

target/board/generic_arm64_plus_armv7/BoardConfig.mk

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# Copyright (C) 2025 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# arm64 emulator specific definitions

TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := arm64-v8a



TARGET_2ND_ARCH := arm

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi



# DO NOT USE

# DO NOT USE

#

# This architecture / CPU variant must NOT be used for any 64 bit

# platform builds. It is the lowest common denominator required

# to build an unbundled application or cts for all supported 32 and 64 bit

# platforms.

#

# If you're building a 64 bit platform (and not an application) the

# ARM-v8 specification allows you to assume all the features available in an

# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant:

#

# TARGET_2ND_ARCH_VARIANT := armv8-a

# TARGET_2ND_CPU_VARIANT := generic

#

# DO NOT USE

# DO NOT USE

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

# DO NOT USE

# DO NOT USE

TARGET_2ND_CPU_VARIANT := generic

# DO NOT USE

# DO NOT USE



# Include 64-bit mediaserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_MEDIASERVER := true

# Include 64-bit drmserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_DRMSERVER := true



include build/make/target/board/BoardConfigGsiCommon.mk

target/board/generic_arm64_plus_armv7/README.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
The "generic_arm64_plus_armv7" product defines a non-hardware-specific arm64

target with armv7 compatible arm32.  It is used for building CTS and other

test suites for which the 32-bit binaries may be run on older devices with

armv7 CPUs.



It is not a product "base class"; no other products inherit

from it or use it in any way.

target/board/generic_arm64_plus_armv7/device.mk

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2025 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

target/product/AndroidProducts.mk

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ ifneq ($(TARGET_BUILD_APPS),) 
PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/aosp_arm64.mk \

    $(LOCAL_DIR)/aosp_arm64_fullmte.mk \

    $(LOCAL_DIR)/aosp_arm64_plus_armv7.mk \

    $(LOCAL_DIR)/aosp_arm.mk \

    $(LOCAL_DIR)/aosp_riscv64.mk \

    $(LOCAL_DIR)/aosp_x86_64.mk \
@@ -48,6 +49,7 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/aosp_64bitonly_x86_64.mk \

    $(LOCAL_DIR)/aosp_arm64.mk \

    $(LOCAL_DIR)/aosp_arm64_fullmte.mk \

    $(LOCAL_DIR)/aosp_arm64_plus_armv7.mk \

    $(LOCAL_DIR)/aosp_arm.mk \

    $(LOCAL_DIR)/aosp_riscv64.mk \

    $(LOCAL_DIR)/aosp_x86_64.mk \

target/product/aosp_arm64_plus_armv7.mk

0 → 100644
+64 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2025 The Android Open-Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# aosp_arm64_plus_armv7 is for building CTS and other test suites with

# arm64 as the primary architecture and armv7 arm32 as the secondary

# architecture.



#

# All components inherited here go to system image

#

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)



PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed



#

# All components inherited here go to system_ext image

#

$(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-if-exists, packages/modules/Virtualization/apex/product_packages.mk)



#

# All components inherited here go to product image

#

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)



#

# All components inherited here go to vendor or vendor_boot image

#

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS ?= system



#

# Special settings for GSI releasing

#

# Build modules from source if this has not been pre-configured

MODULE_BUILD_FROM_SOURCE ?= true



$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)





PRODUCT_NAME := aosp_arm64_plus_armv7

PRODUCT_DEVICE := generic_arm64_plus_armv7

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on ARM64 with ARMV7



PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true