Snap for 11098506 from a2946d1a3fa15e8ab64bc8b6370980376be411bf to sdk-release

Change-Id: I7611501ed00a823e65c00b1797b1485d1abb3fed

5 files changed, 0 insertions, 112 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index b32a963..9fac755 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,8 +15,6 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/car_ui_portrait.mk \
-    $(LOCAL_DIR)/car_x86_64.mk \
     $(LOCAL_DIR)/gsi_car_arm64.mk \
     $(LOCAL_DIR)/gsi_car_x86_64.mk \
     $(LOCAL_DIR)/sdk_car_arm64.mk \
@@ -26,8 +24,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/sdk_car_x86_64.mk \
 
 COMMON_LUNCH_CHOICES := \
-    car_ui_portrait-trunk_staging-userdebug \
-    car_x86_64-trunk_staging-userdebug \
     gsi_car_arm64-trunk_staging-userdebug \
     gsi_car_x86_64-trunk_staging-userdebug \
     sdk_car_arm64-trunk_staging-userdebug \
diff --git a/car_ui_portrait.mk b/car_ui_portrait.mk
deleted file mode 100644
index 6c6b5f4..0000000
--- a/car_ui_portrait.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2021 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_COPY_FILES += \
-    packages/services/Car/car_product/car_ui_portrait/car_ui_portrait.ini:config.ini \
-    packages/services/Car/car_product/car_ui_portrait/bootanimation/bootanimation.zip:system/media/bootanimation.zip
-
-$(call inherit-product, device/generic/goldfish/soong_namespaces.mk)
-
-PRODUCT_PACKAGE_OVERLAYS := \
-    device/generic/car/common/overlay
-
-# Disable the Setup Wizard. This overrides the setting in gms.mk
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.setupwizard.mode=DISABLED
-
-$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
-$(call inherit-product, device/generic/goldfish/64bitonly/product/x86_64-vendor.mk)
-$(call inherit-product, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
-$(call inherit-product, device/generic/goldfish/emulator64_x86_64/device.mk)
-
-$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/apps/car_ui_portrait_apps.mk)
-$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/rro/car_ui_portrait_rro.mk)
-$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/emu/car_ui_portrait_emu.mk)
-
-PRODUCT_SDK_ADDON_NAME := car_emu_x86_64
-
-# Extra files needed by the addon.
-PRODUCT_SDK_ADDON_COPY_FILES := \
-    device/generic/goldfish/data/etc/encryptionkey.img:images/${TARGET_CPU_ABI}/encryptionkey.img\
-    device/generic/car/car_x86_64/manifest.ini:manifest.ini
-
-PRODUCT_SDK_ADDON_COPY_MODULES := \
-    com.android.future.usb.accessory:libs/usb.jar
-
-DEVICE_PACKAGE_OVERLAYS += device/generic/car/car_x86_64/overlay
-
-EMULATOR_VENDOR_NO_SOUND := true
-PRODUCT_NAME := car_ui_portrait
-PRODUCT_DEVICE := emulator_car64_x86_64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := CarUiPortrait on x86_64 emulator
-PRODUCT_SDK_ADDON_NAME := car_ui_portrait
-
-PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
-    device/generic/car/car_x86_64/source.properties
diff --git a/car_x86_64.mk b/car_x86_64.mk
deleted file mode 100644
index 44d551d..0000000
--- a/car_x86_64.mk
+++ /dev/null
@@ -1,46 +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_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-
-$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
-$(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk)
-
-$(call inherit-product, device/generic/goldfish/64bitonly/product/x86_64-vendor.mk)
-$(call inherit-product, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
-$(call inherit-product, device/generic/goldfish/emulator64_x86_64/device.mk)
-
-PRODUCT_SDK_ADDON_NAME := car_emu_x86_64
-
-# Extra files needed by the addon.
-PRODUCT_SDK_ADDON_COPY_FILES := \
-    device/generic/goldfish/data/etc/encryptionkey.img:images/${TARGET_CPU_ABI}/encryptionkey.img\
-    device/generic/car/car_x86_64/manifest.ini:manifest.ini
-
-PRODUCT_SDK_ADDON_COPY_MODULES := \
-    com.android.future.usb.accessory:libs/usb.jar
-
-DEVICE_PACKAGE_OVERLAYS += device/generic/car/car_x86_64/overlay
-
-EMULATOR_VENDOR_NO_SOUND := true
-PRODUCT_NAME := car_x86_64
-PRODUCT_DEVICE := emulator_car64_x86_64
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Car on x86_64 emulator
-PRODUCT_SDK_ADDON_NAME := car_x86_64
-
-PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
-    device/generic/car/car_x86_64/source.properties
diff --git a/sdk_car_arm64.mk b/sdk_car_arm64.mk
index 614cf4a..a2e82ed 100644
--- a/sdk_car_arm64.mk
+++ b/sdk_car_arm64.mk
@@ -47,7 +47,6 @@ $(call inherit-product, device/generic/car/emulator/car_emulator_product.mk)
 #
 $(call inherit-product, device/generic/car/emulator/car_emulator_vendor.mk)
 $(call inherit-product, device/generic/goldfish/64bitonly/product/arm64-vendor.mk)
-$(call inherit-product, device/generic/goldfish/emu64a/device.mk)
 
 EMULATOR_VENDOR_NO_SOUND := true
 PRODUCT_NAME := sdk_car_arm64
diff --git a/sdk_car_x86_64.mk b/sdk_car_x86_64.mk
index 2e751cf..019fc59 100644
--- a/sdk_car_x86_64.mk
+++ b/sdk_car_x86_64.mk
@@ -47,7 +47,6 @@ $(call inherit-product, device/generic/car/emulator/car_emulator_product.mk)
 #
 $(call inherit-product, device/generic/car/emulator/car_emulator_vendor.mk)
 $(call inherit-product, device/generic/goldfish/64bitonly/product/x86_64-vendor.mk)
-$(call inherit-product, device/generic/goldfish/emu64x/device.mk)
 
 EMULATOR_VENDOR_NO_SOUND := true
 PRODUCT_NAME := sdk_car_x86_64