diff options
| author | Roman Kiryanov <rkir@google.com> | 2023-10-17 02:22:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-17 02:22:38 +0000 |
| commit | 584fc887fad856e15857857bf8e0e023c57e8cd5 (patch) | |
| tree | 78bba89e9d7cb850a7385bedf600edbce524eb20 | |
| parent | ff029058adb85e84e8909cb1f2bab3868dbe40b2 (diff) | |
| parent | 71163f9c2bfb8069f886040834b94746e103eee2 (diff) | |
| download | car-584fc887fad856e15857857bf8e0e023c57e8cd5.tar.gz | |
Retire obsolete 32bit-only targets am: 5809470ed3 am: 48d0665cd7 am: 71163f9c2b
Original change: https://android-review.googlesource.com/c/device/generic/car/+/2789812
Change-Id: I53c703b07efb542be898e05179ba4a24da271bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AndroidProducts.mk | 4 | ||||
| -rw-r--r-- | sdk_car_arm.mk | 25 | ||||
| -rw-r--r-- | sdk_car_x86.mk | 25 |
3 files changed, 0 insertions, 54 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index f2a74c8..298bc26 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -18,21 +18,17 @@ 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 := \ 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 |