Change targets aosp_atv_arm(64)_ab to aosp_atv_arm(64)
The BoardConfig for generic_arm(64)_ab are going to phased out.
Changes aosp_atv_arm(64)_ab to aosp_atv_arm(64) to avoid using
generic_arm(64)_ab, and keep targets aosp_atv_arm(64)_ab as
aliases.
Bug: 140601829
Test: build pass
Change-Id: Ic8d70b25bda6d3b4957a0030caa32258bbba19e2
Merged-In: Ic8d70b25bda6d3b4957a0030caa32258bbba19e2
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 8c1ed22..2f13dac 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -32,5 +32,7 @@
#
PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/aosp_atv_arm.mk \
$(LOCAL_DIR)/aosp_atv_arm_ab.mk \
+ $(LOCAL_DIR)/aosp_atv_arm64.mk \
$(LOCAL_DIR)/aosp_atv_arm64_ab.mk
diff --git a/products/aosp_atv_arm.mk b/products/aosp_atv_arm.mk
new file mode 100644
index 0000000..878a0ae
--- /dev/null
+++ b/products/aosp_atv_arm.mk
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2019 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
+
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS := system
+PRODUCT_PACKAGES += \
+ update_engine \
+ update_verifier
+
+PRODUCT_NAME := aosp_atv_arm
+PRODUCT_DEVICE := generic
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP ATV on ARM32
diff --git a/products/aosp_atv_arm64.mk b/products/aosp_atv_arm64.mk
new file mode 100644
index 0000000..37c3b30
--- /dev/null
+++ b/products/aosp_atv_arm64.mk
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2019 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
+
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS := system
+PRODUCT_PACKAGES += \
+ update_engine \
+ update_verifier
+
+PRODUCT_NAME := aosp_atv_arm64
+PRODUCT_DEVICE := generic_arm64
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP ATV on ARM64
diff --git a/products/aosp_atv_arm64_ab.mk b/products/aosp_atv_arm64_ab.mk
index 56b0cf1..f76aae8 100644
--- a/products/aosp_atv_arm64_ab.mk
+++ b/products/aosp_atv_arm64_ab.mk
@@ -14,20 +14,11 @@
# 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.
+# This is an alias target of aosp_atv_arm64
-include device/google/atv/products/treble_atv_common_64.mk
-
-AB_OTA_UPDATER := true
-AB_OTA_PARTITIONS := system
-PRODUCT_PACKAGES += \
- update_engine \
- update_verifier
+include device/google/atv/products/aosp_atv_arm64.mk
PRODUCT_NAME := aosp_atv_arm64_ab
-PRODUCT_DEVICE := generic_arm64_ab
+PRODUCT_DEVICE := generic_arm64
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP ATV on ARM64
diff --git a/products/aosp_atv_arm_ab.mk b/products/aosp_atv_arm_ab.mk
index d359582..c93a298 100644
--- a/products/aosp_atv_arm_ab.mk
+++ b/products/aosp_atv_arm_ab.mk
@@ -14,20 +14,11 @@
# 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.
+# This is an alias target of aosp_atv_arm64
-include device/google/atv/products/treble_atv_common_32.mk
-
-AB_OTA_UPDATER := true
-AB_OTA_PARTITIONS := system
-PRODUCT_PACKAGES += \
- update_engine \
- update_verifier
+include device/google/atv/products/aosp_atv_arm.mk
PRODUCT_NAME := aosp_atv_arm_ab
-PRODUCT_DEVICE := generic_arm_ab
+PRODUCT_DEVICE := generic
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP ATV on ARM32
