diff options
| -rw-r--r-- | target/board/generic_arm64_ab/BoardConfig.mk | 39 | ||||
| -rw-r--r-- | target/board/generic_arm_ab/BoardConfig.mk | 36 | ||||
| -rw-r--r-- | target/board/generic_x86_64_ab/BoardConfig.mk | 25 | ||||
| -rw-r--r-- | target/board/generic_x86_ab/BoardConfig.mk | 24 | ||||
| -rw-r--r-- | target/product/AndroidProducts.mk | 4 | ||||
| -rw-r--r-- | target/product/aosp_arm64_ab.mk | 58 | ||||
| -rw-r--r-- | target/product/aosp_arm_ab.mk | 57 | ||||
| -rw-r--r-- | target/product/aosp_x86_64_ab.mk | 58 | ||||
| -rw-r--r-- | target/product/aosp_x86_ab.mk | 58 | ||||
| -rw-r--r-- | target/product/legacy_gsi_release.mk | 37 |
10 files changed, 396 insertions, 0 deletions
diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk new file mode 100644 index 0000000000..7c91607a4d --- /dev/null +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -0,0 +1,39 @@ +# +# Copyright (C) 2017 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. +# + +include build/make/target/board/BoardConfigGsiCommon.mk + +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_ABI := arm64-v8a +TARGET_CPU_ABI2 := +TARGET_CPU_VARIANT := generic + +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv8-a +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi +TARGET_2ND_CPU_VARIANT := generic + +# TODO(jiyong) These might be SoC specific. +BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo + +# TODO(b/36764215): remove this setting when the generic system image +# no longer has QCOM-specific directories under /. +BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk new file mode 100644 index 0000000000..21b763c0a3 --- /dev/null +++ b/target/board/generic_arm_ab/BoardConfig.mk @@ -0,0 +1,36 @@ +# +# Copyright (C) 2017 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. +# + +include build/make/target/board/BoardConfigGsiCommon.mk + +TARGET_ARCH := arm +TARGET_ARCH_VARIANT := armv7-a-neon +TARGET_CPU_ABI := armeabi-v7a +TARGET_CPU_ABI2 := armeabi +TARGET_CPU_VARIANT := generic + +# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch +TARGET_USES_64_BIT_BINDER := false + +# TODO(jiyong) These might be SoC specific. +BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo + +# TODO(b/36764215): remove this setting when the generic system image +# no longer has QCOM-specific directories under /. +BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy diff --git a/target/board/generic_x86_64_ab/BoardConfig.mk b/target/board/generic_x86_64_ab/BoardConfig.mk new file mode 100644 index 0000000000..1dd5e4898d --- /dev/null +++ b/target/board/generic_x86_64_ab/BoardConfig.mk @@ -0,0 +1,25 @@ +# +# Copyright (C) 2017 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. +# + +include build/make/target/board/BoardConfigGsiCommon.mk + +TARGET_CPU_ABI := x86_64 +TARGET_ARCH := x86_64 +TARGET_ARCH_VARIANT := x86_64 + +TARGET_2ND_CPU_ABI := x86 +TARGET_2ND_ARCH := x86 +TARGET_2ND_ARCH_VARIANT := x86_64 diff --git a/target/board/generic_x86_ab/BoardConfig.mk b/target/board/generic_x86_ab/BoardConfig.mk new file mode 100644 index 0000000000..53acffd239 --- /dev/null +++ b/target/board/generic_x86_ab/BoardConfig.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2017 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. +# + +include build/make/target/board/BoardConfigGsiCommon.mk + +TARGET_CPU_ABI := x86 +TARGET_ARCH := x86 +TARGET_ARCH_VARIANT := x86 + +# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch +TARGET_USES_64_BIT_BINDER := false diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 5ecaf26265..4121bc10e2 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -43,9 +43,13 @@ PRODUCT_MAKEFILES := \ else PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/aosp_arm64_ab.mk \ $(LOCAL_DIR)/aosp_arm64.mk \ + $(LOCAL_DIR)/aosp_arm_ab.mk \ $(LOCAL_DIR)/aosp_arm.mk \ + $(LOCAL_DIR)/aosp_x86_64_ab.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ + $(LOCAL_DIR)/aosp_x86_ab.mk \ $(LOCAL_DIR)/aosp_x86_arm.mk \ $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/full.mk \ diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk new file mode 100644 index 0000000000..75b9cc4f4b --- /dev/null +++ b/target/product/aosp_arm64_ab.mk @@ -0,0 +1,58 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/ +# gsi_system.prop. + +# aosp_arm64_ab-userdebug is a Legacy GSI for the devices with: +# - ARM 64 bits user space +# - 64 bits binder interface +# - system-as-root + +# +# All components inherited here go to system image +# (The system image of Legacy GSI is not CSI) +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (aosp_arm64_ab,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# 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) + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# Special settings for GSI releasing +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_release.mk) + +PRODUCT_NAME := aosp_arm64_ab +PRODUCT_DEVICE := generic_arm64_ab +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on ARM64 diff --git a/target/product/aosp_arm_ab.mk b/target/product/aosp_arm_ab.mk new file mode 100644 index 0000000000..80ebdb1518 --- /dev/null +++ b/target/product/aosp_arm_ab.mk @@ -0,0 +1,57 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/ +# gsi_system.prop. + +# aosp_arm_ab-userdebug is a Legacy GSI for the devices with: +# - ARM 32 bits user space +# - 32 bits binder interface +# - system-as-root + +# +# All components inherited here go to system image +# (The system image of Legacy GSI is not CSI) +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (aosp_arm_ab,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# 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) + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# Special settings for GSI releasing +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_release.mk) + +PRODUCT_NAME := aosp_arm_ab +PRODUCT_DEVICE := generic_arm_ab +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on ARM32 diff --git a/target/product/aosp_x86_64_ab.mk b/target/product/aosp_x86_64_ab.mk new file mode 100644 index 0000000000..9d23fc7b08 --- /dev/null +++ b/target/product/aosp_x86_64_ab.mk @@ -0,0 +1,58 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/ +# gsi_system.prop. + +# aosp_x86_64_ab-userdebug is a Legacy GSI for the devices with: +# - x86 64 bits user space +# - 64 bits binder interface +# - system-as-root + +# +# All components inherited here go to system image +# (The system image of Legacy GSI is not CSI) +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (aosp_x86_64_ab,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# 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) + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# Special settings for GSI releasing +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_release.mk) + +PRODUCT_NAME := aosp_x86_64_ab +PRODUCT_DEVICE := generic_x86_64_ab +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on x86_64 diff --git a/target/product/aosp_x86_ab.mk b/target/product/aosp_x86_ab.mk new file mode 100644 index 0000000000..6b6a4c61ad --- /dev/null +++ b/target/product/aosp_x86_ab.mk @@ -0,0 +1,58 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/ +# gsi_system.prop. + +# aosp_x86_ab-userdebug is a Legacy GSI for the devices with: +# - x86 32 bits user space +# - 32 bits binder interface +# - system-as-root + +# +# All components inherited here go to system image +# (The system image of Legacy GSI is not CSI) +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (aosp_x86_ab,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# 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) + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# Special settings for GSI releasing +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_release.mk) + +PRODUCT_NAME := aosp_x86_ab +PRODUCT_DEVICE := generic_x86_ab +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on x86 diff --git a/target/product/legacy_gsi_release.mk b/target/product/legacy_gsi_release.mk new file mode 100644 index 0000000000..f0724814b4 --- /dev/null +++ b/target/product/legacy_gsi_release.mk @@ -0,0 +1,37 @@ +# +# Copyright (C) 2020 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. +# + +include $(SRC_TARGET_DIR)/product/gsi_release.mk + +PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ + system/etc/init/init.legacy-gsi.rc \ + system/etc/init/gsi/init.vndk-27.rc \ + system/etc/ld.config.vndk_lite.txt \ + +# Legacy GSI support additional O-MR1 interface +PRODUCT_EXTRA_VNDK_VERSIONS += 27 + +# Support for the O-MR1 devices +PRODUCT_COPY_FILES += \ + build/make/target/product/gsi/init.legacy-gsi.rc:system/etc/init/init.legacy-gsi.rc \ + build/make/target/product/gsi/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc + +# Namespace configuration file for non-enforcing VNDK +PRODUCT_PACKAGES += \ + ld.config.vndk_lite.txt + +# Legacy GSI relax the compatible property checking +PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := false |