From e04167e58b55ecd2d753baa7118f3137bc9de71a Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 11 Oct 2023 16:56:37 -0700 Subject: [PATCH] Retire obsolete (32bit-only) emulator targets and boards Please use 64bit-only targets instead: * sdk_phone64_x86_64 * sdk_phone64_arm64 * we don't support x86+arm for AOSP targets Bug: 295259752 Test: presubmit Change-Id: I887e21ad00e6981a162da5cf1cc47827d068eee7 Signed-off-by: Roman Kiryanov --- target/board/emulator_arm/AndroidBoard.mk | 1 - target/board/emulator_arm/BoardConfig.mk | 37 ----------- target/board/emulator_arm/device.mk | 18 ----- target/board/emulator_arm/system_ext.prop | 5 -- target/board/emulator_x86/BoardConfig.mk | 40 ----------- target/board/emulator_x86/device.mk | 27 -------- target/board/emulator_x86/system_ext.prop | 5 -- target/board/emulator_x86_arm/BoardConfig.mk | 52 --------------- target/board/emulator_x86_arm/device.mk | 18 ----- target/board/emulator_x86_arm/system_ext.prop | 5 -- target/product/sdk_phone_armv7.mk | 66 ------------------- target/product/sdk_phone_x86.mk | 61 ----------------- 12 files changed, 335 deletions(-) delete mode 100644 target/board/emulator_arm/AndroidBoard.mk delete mode 100644 target/board/emulator_arm/BoardConfig.mk delete mode 100644 target/board/emulator_arm/device.mk delete mode 100644 target/board/emulator_arm/system_ext.prop delete mode 100644 target/board/emulator_x86/BoardConfig.mk delete mode 100644 target/board/emulator_x86/device.mk delete mode 100644 target/board/emulator_x86/system_ext.prop delete mode 100644 target/board/emulator_x86_arm/BoardConfig.mk delete mode 100644 target/board/emulator_x86_arm/device.mk delete mode 100644 target/board/emulator_x86_arm/system_ext.prop delete mode 100644 target/product/sdk_phone_armv7.mk delete mode 100644 target/product/sdk_phone_x86.mk diff --git a/target/board/emulator_arm/AndroidBoard.mk b/target/board/emulator_arm/AndroidBoard.mk deleted file mode 100644 index 7911f6105f..0000000000 --- a/target/board/emulator_arm/AndroidBoard.mk +++ /dev/null @@ -1 +0,0 @@ -LOCAL_PATH := $(call my-dir) diff --git a/target/board/emulator_arm/BoardConfig.mk b/target/board/emulator_arm/BoardConfig.mk deleted file mode 100644 index 287824fa7b..0000000000 --- a/target/board/emulator_arm/BoardConfig.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2020 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. -# - -# arm emulator specific definitions -TARGET_ARCH := arm -TARGET_ARCH_VARIANT := armv7-a-neon -TARGET_CPU_VARIANT := generic -TARGET_CPU_ABI := armeabi-v7a -TARGET_CPU_ABI2 := armeabi - -include build/make/target/board/BoardConfigGsiCommon.mk -include build/make/target/board/BoardConfigEmuCommon.mk - -BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 - -# Wifi. -BOARD_WLAN_DEVICE := emulator -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated -WPA_SUPPLICANT_VERSION := VER_0_8_X -WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" -WIFI_DRIVER_FW_PATH_STA := "/dev/null" -WIFI_DRIVER_FW_PATH_AP := "/dev/null" diff --git a/target/board/emulator_arm/device.mk b/target/board/emulator_arm/device.mk deleted file mode 100644 index af023eb25c..0000000000 --- a/target/board/emulator_arm/device.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2020 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_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu -PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. diff --git a/target/board/emulator_arm/system_ext.prop b/target/board/emulator_arm/system_ext.prop deleted file mode 100644 index 64829f3ce4..0000000000 --- a/target/board/emulator_arm/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib/libreference-ril.so diff --git a/target/board/emulator_x86/BoardConfig.mk b/target/board/emulator_x86/BoardConfig.mk deleted file mode 100644 index 8f79166b48..0000000000 --- a/target/board/emulator_x86/BoardConfig.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2020 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. -# - -# x86 emulator specific definitions -TARGET_CPU_ABI := x86 -TARGET_ARCH := x86 -TARGET_ARCH_VARIANT := x86 - -TARGET_PRELINK_MODULE := false - -include build/make/target/board/BoardConfigGsiCommon.mk -include build/make/target/board/BoardConfigEmuCommon.mk - -# Resize to 4G to accommodate ASAN and CTS -BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 - -BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86 - -# Wifi. -BOARD_WLAN_DEVICE := emulator -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated -WPA_SUPPLICANT_VERSION := VER_0_8_X -WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" -WIFI_DRIVER_FW_PATH_STA := "/dev/null" -WIFI_DRIVER_FW_PATH_AP := "/dev/null" diff --git a/target/board/emulator_x86/device.mk b/target/board/emulator_x86/device.mk deleted file mode 100644 index 8a9d8da921..0000000000 --- a/target/board/emulator_x86/device.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2020 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_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu -PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. - -ifdef NET_ETH0_STARTONBOOT - PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 -endif - -# Ensure we package the BIOS files too. -PRODUCT_HOST_PACKAGES += \ - bios.bin \ - vgabios-cirrus.bin \ diff --git a/target/board/emulator_x86/system_ext.prop b/target/board/emulator_x86/system_ext.prop deleted file mode 100644 index 64829f3ce4..0000000000 --- a/target/board/emulator_x86/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib/libreference-ril.so diff --git a/target/board/emulator_x86_arm/BoardConfig.mk b/target/board/emulator_x86_arm/BoardConfig.mk deleted file mode 100644 index 21fdbc8e99..0000000000 --- a/target/board/emulator_x86_arm/BoardConfig.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2020 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. -# - -# x86 emulator specific definitions -TARGET_CPU_ABI := x86 -TARGET_ARCH := x86 -TARGET_ARCH_VARIANT := x86 - -TARGET_NATIVE_BRIDGE_ARCH := arm -TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv7-a-neon -TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic -TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi - -BUILD_BROKEN_DUP_RULES := true - -# -# The inclusion order below is important. -# The settings in latter makefiles overwrite those in the former. -# -include build/make/target/board/BoardConfigMainlineCommon.mk -include build/make/target/board/BoardConfigEmuCommon.mk - -# the settings differ from BoardConfigMainlineCommon.mk -BOARD_USES_SYSTEM_OTHER_ODEX := - -# Resize to 4G to accommodate ASAN and CTS -BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 - -BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86 - -# Wifi. -BOARD_WLAN_DEVICE := emulator -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated -WPA_SUPPLICANT_VERSION := VER_0_8_X -WIFI_DRIVER_FW_PATH_PARAM := "/dev/null" -WIFI_DRIVER_FW_PATH_STA := "/dev/null" -WIFI_DRIVER_FW_PATH_AP := "/dev/null" diff --git a/target/board/emulator_x86_arm/device.mk b/target/board/emulator_x86_arm/device.mk deleted file mode 100644 index af023eb25c..0000000000 --- a/target/board/emulator_x86_arm/device.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2020 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_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu -PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. diff --git a/target/board/emulator_x86_arm/system_ext.prop b/target/board/emulator_x86_arm/system_ext.prop deleted file mode 100644 index 64829f3ce4..0000000000 --- a/target/board/emulator_x86_arm/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib/libreference-ril.so diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk deleted file mode 100644 index 293b1eab49..0000000000 --- a/target/product/sdk_phone_armv7.mk +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2007 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_USE_DYNAMIC_PARTITIONS := true - -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. - -# Enable mainline checking for exact this product name -ifeq (sdk_phone_armv7,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -# -# All components inherited here go to system image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) - -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) - -# -# All components inherited here go to vendor image -# -$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk) - -# keep this apk for sdk targets for now -PRODUCT_PACKAGES += \ - EmulatorSmokeTests - - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_armv7 -PRODUCT_DEVICE := emulator_arm -PRODUCT_MODEL := Android SDK built for arm -# Disable checks for SDK product. It lacks some libraries (e.g. -# RadioConfigLib), which makes it impossible to translate their module names to -# library name, so the check fails. -PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true - -PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk deleted file mode 100644 index 90cd8d5ba6..0000000000 --- a/target/product/sdk_phone_x86.mk +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2009 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_USE_DYNAMIC_PARTITIONS := true - -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. - -# -# All components inherited here go to system image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) - -# Enable mainline checking for exact this product name -ifeq (sdk_phone_x86,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) - -# -# All components inherited here go to vendor image -# -$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86/device.mk) - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_x86 -PRODUCT_DEVICE := emulator_x86 -PRODUCT_MODEL := Android SDK built for x86 -# Disable checks for SDK product. It lacks some libraries (e.g. -# RadioConfigLib), which makes it impossible to translate their module names to -# library name, so the check fails. -PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true - -PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true