From b90ffb0f9ae1b036520b31094c5636716e6c1bd1 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 12 Feb 2019 16:37:29 +0800 Subject: [PATCH] Phase out all _a targets The _a targets are build for Legacy GSI for non-system-as-root partition layout devices. The Android build system is not able to build a system image with non-system-as-root anymore. Also, `init` supports mounting system-as-root system image at all, all devices should no problem to mount it. Bug: 124278972 Test: none Change-Id: I9c56e7e5d8517a630854f030616c3b3ecb94b9a8 --- target/board/generic_arm64_a/BoardConfig.mk | 32 -------------- target/board/generic_arm_a/BoardConfig.mk | 29 ------------- target/board/generic_x86_64_a/BoardConfig.mk | 28 ------------ target/board/generic_x86_a/BoardConfig.mk | 27 ------------ target/product/AndroidProducts.mk | 4 -- target/product/aosp_arm64_a.mk | 45 -------------------- target/product/aosp_arm_a.mk | 32 -------------- target/product/aosp_x86_64_a.mk | 45 -------------------- target/product/aosp_x86_a.mk | 32 -------------- 9 files changed, 274 deletions(-) delete mode 100644 target/board/generic_arm64_a/BoardConfig.mk delete mode 100644 target/board/generic_arm_a/BoardConfig.mk delete mode 100644 target/board/generic_x86_64_a/BoardConfig.mk delete mode 100644 target/board/generic_x86_a/BoardConfig.mk delete mode 100644 target/product/aosp_arm64_a.mk delete mode 100644 target/product/aosp_arm_a.mk delete mode 100644 target/product/aosp_x86_64_a.mk delete mode 100644 target/product/aosp_x86_a.mk diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk deleted file mode 100644 index 68aedfc1a..000000000 --- a/target/board/generic_arm64_a/BoardConfig.mk +++ /dev/null @@ -1,32 +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 - -# This is a non-system-as-root Legacy GSI build target -BOARD_BUILD_SYSTEM_ROOT_IMAGE := false diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk deleted file mode 100644 index 464a74f1e..000000000 --- a/target/board/generic_arm_a/BoardConfig.mk +++ /dev/null @@ -1,29 +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 - -# This is a non-system-as-root Legacy GSI build target -BOARD_BUILD_SYSTEM_ROOT_IMAGE := false diff --git a/target/board/generic_x86_64_a/BoardConfig.mk b/target/board/generic_x86_64_a/BoardConfig.mk deleted file mode 100644 index 07eef4f42..000000000 --- a/target/board/generic_x86_64_a/BoardConfig.mk +++ /dev/null @@ -1,28 +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 - -# This is a non-system-as-root Legacy GSI build target -BOARD_BUILD_SYSTEM_ROOT_IMAGE := false diff --git a/target/board/generic_x86_a/BoardConfig.mk b/target/board/generic_x86_a/BoardConfig.mk deleted file mode 100644 index e3e8a3afe..000000000 --- a/target/board/generic_x86_a/BoardConfig.mk +++ /dev/null @@ -1,27 +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 - -# This is a non-system-as-root Legacy GSI build target -BOARD_BUILD_SYSTEM_ROOT_IMAGE := false diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 12fd99a77..cfb893082 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -44,16 +44,12 @@ PRODUCT_MAKEFILES := \ else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm64_ab.mk \ - $(LOCAL_DIR)/aosp_arm64_a.mk \ $(LOCAL_DIR)/aosp_arm64.mk \ $(LOCAL_DIR)/aosp_arm_ab.mk \ - $(LOCAL_DIR)/aosp_arm_a.mk \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/aosp_x86_64_ab.mk \ - $(LOCAL_DIR)/aosp_x86_64_a.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ $(LOCAL_DIR)/aosp_x86_ab.mk \ - $(LOCAL_DIR)/aosp_x86_a.mk \ $(LOCAL_DIR)/aosp_x86_arm.mk \ $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/full.mk \ diff --git a/target/product/aosp_arm64_a.mk b/target/product/aosp_arm64_a.mk deleted file mode 100644 index e45229d08..000000000 --- a/target/product/aosp_arm64_a.mk +++ /dev/null @@ -1,45 +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_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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk) - -# Enable mainline checking for excat this product name -ifeq (aosp_arm64_a,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote32_64.rc \ - root/init.zygote64_32.rc \ - -# Copy different zygote settings for vendor.img to select by setting property -# ro.zygote=zygote64_32 or ro.zygote=zygote32_64: -# 1. 64-bit primary, 32-bit secondary OR -# 2. 32-bit primary, 64-bit secondary -# init.zygote64_32.rc is in the core_64_bit.mk below -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc - -PRODUCT_NAME := aosp_arm64_a -PRODUCT_DEVICE := generic_arm64_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on ARM64 diff --git a/target/product/aosp_arm_a.mk b/target/product/aosp_arm_a.mk deleted file mode 100644 index 249ad2c40..000000000 --- a/target/product/aosp_arm_a.mk +++ /dev/null @@ -1,32 +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_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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk) - -# Enable mainline checking for excat this product name -ifeq (aosp_arm_a,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -PRODUCT_NAME := aosp_arm_a -PRODUCT_DEVICE := generic_arm_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on ARM32 diff --git a/target/product/aosp_x86_64_a.mk b/target/product/aosp_x86_64_a.mk deleted file mode 100644 index f40b9a900..000000000 --- a/target/product/aosp_x86_64_a.mk +++ /dev/null @@ -1,45 +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_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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk) - -# Enable mainline checking for excat this product name -ifeq (aosp_x86_64_a,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote32_64.rc \ - root/init.zygote64_32.rc \ - -# Copy different zygote settings for vendor.img to select by setting property -# ro.zygote=zygote64_32 or ro.zygote=zygote32_64: -# 1. 64-bit primary, 32-bit secondary OR -# 2. 32-bit primary, 64-bit secondary -# init.zygote64_32.rc is in the core_64_bit.mk below -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc - -PRODUCT_NAME := aosp_x86_64_a -PRODUCT_DEVICE := generic_x86_64_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on x86_64 diff --git a/target/product/aosp_x86_a.mk b/target/product/aosp_x86_a.mk deleted file mode 100644 index 743e0b9bc..000000000 --- a/target/product/aosp_x86_a.mk +++ /dev/null @@ -1,32 +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_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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk) - -# Enable mainline checking for excat this product name -ifeq (aosp_x86_a,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -PRODUCT_NAME := aosp_x86_a -PRODUCT_DEVICE := generic_x86_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on x86