From e814a4e7eff400499d7d044fd605d4060db4d64b Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Wed, 27 Mar 2019 12:10:49 +0800 Subject: 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: Ibc9b1458b5f397c1ad8df80903061f5b7fe5352c --- products/AndroidProducts.mk | 2 -- products/aosp_atv_arm64_a.mk | 27 --------------------------- products/aosp_atv_arm_a.mk | 27 --------------------------- 3 files changed, 56 deletions(-) delete mode 100644 products/aosp_atv_arm64_a.mk delete mode 100644 products/aosp_atv_arm_a.mk diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index 6f7ebdb..8c1ed22 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -32,7 +32,5 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/aosp_atv_arm_a.mk \ $(LOCAL_DIR)/aosp_atv_arm_ab.mk \ - $(LOCAL_DIR)/aosp_atv_arm64_a.mk \ $(LOCAL_DIR)/aosp_atv_arm64_ab.mk diff --git a/products/aosp_atv_arm64_a.mk b/products/aosp_atv_arm64_a.mk deleted file mode 100644 index 0fc76c2..0000000 --- a/products/aosp_atv_arm64_a.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2018 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/ -# treble_system.prop. - -include device/google/atv/products/treble_atv_common_64.mk - -PRODUCT_NAME := aosp_atv_arm64_a -PRODUCT_DEVICE := generic_arm64_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP ATV on ARM64 diff --git a/products/aosp_atv_arm_a.mk b/products/aosp_atv_arm_a.mk deleted file mode 100644 index 83af0e9..0000000 --- a/products/aosp_atv_arm_a.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2018 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/ -# treble_system.prop. - -include device/google/atv/products/treble_atv_common_32.mk - -PRODUCT_NAME := aosp_atv_arm_a -PRODUCT_DEVICE := generic_arm_a -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP ATV on ARM32 -- cgit v1.2.3