Merge "Phase out all _a targets"
am: fde506a6d7
Change-Id: I6d3935cad6fabf8d3d963af501d936432e1f0c19
This commit is contained in:
SzuWei Lin
android-build-merger
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -44,16 +44,12 @@ PRODUCT_MAKEFILES := \
|
|||||||
else
|
else
|
||||||
PRODUCT_MAKEFILES := \
|
PRODUCT_MAKEFILES := \
|
||||||
$(LOCAL_DIR)/aosp_arm64_ab.mk \
|
$(LOCAL_DIR)/aosp_arm64_ab.mk \
|
||||||
$(LOCAL_DIR)/aosp_arm64_a.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_arm64.mk \
|
$(LOCAL_DIR)/aosp_arm64.mk \
|
||||||
$(LOCAL_DIR)/aosp_arm_ab.mk \
|
$(LOCAL_DIR)/aosp_arm_ab.mk \
|
||||||
$(LOCAL_DIR)/aosp_arm_a.mk \
|
|
||||||
$(LOCAL_DIR)/aosp_arm.mk \
|
$(LOCAL_DIR)/aosp_arm.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86_64_ab.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_64.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86_ab.mk \
|
$(LOCAL_DIR)/aosp_x86_ab.mk \
|
||||||
$(LOCAL_DIR)/aosp_x86_a.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,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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user