summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2023-10-16 12:37:52 -0700
committerRoman Kiryanov <rkir@google.com>2023-10-16 12:37:52 -0700
commit5809470ed32467be8cc3476e82d238702000a915 (patch)
treee526a22d493a93d62f02165e81409a50b0965a07
parent921ab8b9941c7f92bd8338f7c67d5b47fc38fbb9 (diff)
downloadcar-5809470ed32467be8cc3476e82d238702000a915.tar.gz
Retire obsolete 32bit-only targets
Bug: 295259752 Test: presubmit Change-Id: Id42bd7e3cf1f02a4095b80cf5288dbafd8655cc9 Signed-off-by: Roman Kiryanov <rkir@google.com>
-rw-r--r--AndroidProducts.mk4
-rw-r--r--sdk_car_arm.mk25
-rw-r--r--sdk_car_x86.mk25
3 files changed, 0 insertions, 54 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 047c5e1..a22521b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -20,11 +20,9 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/gsi_car_arm64.mk \
$(LOCAL_DIR)/gsi_car_x86_64.mk \
$(LOCAL_DIR)/sdk_car_arm64.mk \
- $(LOCAL_DIR)/sdk_car_arm.mk \
$(LOCAL_DIR)/sdk_car_md_arm64.mk \
$(LOCAL_DIR)/sdk_car_md_x86_64.mk \
$(LOCAL_DIR)/sdk_car_portrait_x86_64.mk \
- $(LOCAL_DIR)/sdk_car_x86.mk \
$(LOCAL_DIR)/sdk_car_x86_64.mk \
COMMON_LUNCH_CHOICES := \
@@ -32,11 +30,9 @@ COMMON_LUNCH_CHOICES := \
car_x86_64-userdebug \
gsi_car_arm64-userdebug \
gsi_car_x86_64-userdebug \
- sdk_car_arm-userdebug \
sdk_car_arm64-userdebug \
sdk_car_md_x86_64-userdebug \
sdk_car_portrait_x86_64-userdebug \
- sdk_car_x86-userdebug \
sdk_car_x86_64-userdebug \
EMULATOR_VENDOR_NO_SOUND_TRIGGER := false
diff --git a/sdk_car_arm.mk b/sdk_car_arm.mk
deleted file mode 100644
index 032dc05..0000000
--- a/sdk_car_arm.mk
+++ /dev/null
@@ -1,25 +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_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/sdk_phone_armv7.mk)
-
-EMULATOR_VENDOR_NO_SOUND := true
-PRODUCT_NAME := sdk_car_arm
-PRODUCT_DEVICE := emulator_arm
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Car on ARM emulator
diff --git a/sdk_car_x86.mk b/sdk_car_x86.mk
deleted file mode 100644
index 42c8b22..0000000
--- a/sdk_car_x86.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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/sdk_phone_x86.mk)
-
-EMULATOR_VENDOR_NO_SOUND := true
-PRODUCT_NAME := sdk_car_x86
-PRODUCT_DEVICE := emulator_x86
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Car on x86 emulator