Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I826da4ee82f0737bc41bb7fd21b97898566efa48
BUG: 129345239

6 files changed, 3 insertions, 59 deletions

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
diff --git a/products/atv_x86.mk b/products/atv_x86.mk
index f6d2ece..1f33a25 100644
--- a/products/atv_x86.mk
+++ b/products/atv_x86.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-PRODUCT_PACKAGES := \
+PRODUCT_HOST_PACKAGES := \
     bios.bin \
     vgabios-cirrus.bin
 
diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template
index 19562d5..3c6a41e 100644
--- a/sdk/images_armeabi-v7a_source.prop_template
+++ b/sdk/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=2
+Pkg.Revision=3
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi-v7a
diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index 17e5403..2395179 100644
--- a/sdk/images_x86_source.prop_template
+++ b/sdk/images_x86_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=2
+Pkg.Revision=3
 Pkg.Dependencies=emulator#28.1.6
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}