Merge "Phase out Legacy GSI" am: a0aebc1081
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796 Change-Id: I86e6382b26dabef97873ff7a1f6bcee8c2ad2a3b
This commit is contained in:
Treehugger Robot
Automerger Merge Worker
@@ -1,39 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
@@ -44,13 +44,9 @@ PRODUCT_MAKEFILES := \
|
|||||||
else
|
else
|
||||||
PRODUCT_MAKEFILES := \
|
PRODUCT_MAKEFILES := \
|
||||||
$(LOCAL_DIR)/aosp_64bitonly_x86_64.mk \
|
$(LOCAL_DIR)/aosp_64bitonly_x86_64.mk \
|
||||||
$(LOCAL_DIR)/aosp_arm64_ab.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_arm64.mk \
|
$(LOCAL_DIR)/aosp_arm64.mk \
|
||||||
$(LOCAL_DIR)/aosp_arm_ab.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_arm.mk \
|
$(LOCAL_DIR)/aosp_arm.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86_64_ab.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_x86_64.mk \
|
$(LOCAL_DIR)/aosp_x86_64.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86_ab.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_x86_arm.mk \
|
$(LOCAL_DIR)/aosp_x86_arm.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86.mk \
|
$(LOCAL_DIR)/aosp_x86.mk \
|
||||||
$(LOCAL_DIR)/full.mk \
|
$(LOCAL_DIR)/full.mk \
|
||||||
|
|||||||
@@ -1,58 +0,0 @@
|
|||||||
#
|
|
||||||
# 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_VENDOR_PROPERTIES 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/generic_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
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
#
|
|
||||||
# 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_VENDOR_PROPERTIES 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/generic_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
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#
|
|
||||||
# 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_VENDOR_PROPERTIES 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/generic_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
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#
|
|
||||||
# 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_VENDOR_PROPERTIES 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/generic_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
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Legacy GSI support additional O-MR1 interface
|
|
||||||
PRODUCT_EXTRA_VNDK_VERSIONS += 27
|
|
||||||
|
|
||||||
# Legacy GSI relax the compatible property checking
|
|
||||||
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := false
|
|
||||||
Reference in New Issue
Block a user