From 4bf479f6057ad532c792e26d3d958a8b50fc1f02 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Mon, 30 Oct 2023 16:16:15 -0700 Subject: [PATCH] Retire obsolete emulator targets and boards the sdk_phone* targets are replaced with sdk_phone64*, the emulator* boards are replaced with emu64* in the device/generic/goldfish folder. Bug: 295259752 Test: presubmit Change-Id: I069a06baf02aea30db617f183abbfeaa6f968f29 Signed-off-by: Roman Kiryanov --- target/board/emulator_arm64/BoardConfig.mk | 66 ------------------- target/board/emulator_arm64/device.mk | 19 ------ target/board/emulator_arm64/system_ext.prop | 5 -- target/board/emulator_x86_64/BoardConfig.mk | 42 ------------ target/board/emulator_x86_64/device.mk | 27 -------- target/board/emulator_x86_64/system_ext.prop | 5 -- .../emulator_x86_64_arm64/BoardConfig.mk | 59 ----------------- target/board/emulator_x86_64_arm64/device.mk | 18 ----- .../emulator_x86_64_arm64/system_ext.prop | 5 -- target/product/AndroidProducts.mk | 2 - target/product/emulator_vendor.mk | 52 --------------- target/product/sdk_phone_arm64.mk | 66 ------------------- target/product/sdk_phone_x86_64.mk | 62 ----------------- 13 files changed, 428 deletions(-) delete mode 100644 target/board/emulator_arm64/BoardConfig.mk delete mode 100644 target/board/emulator_arm64/device.mk delete mode 100644 target/board/emulator_arm64/system_ext.prop delete mode 100755 target/board/emulator_x86_64/BoardConfig.mk delete mode 100755 target/board/emulator_x86_64/device.mk delete mode 100644 target/board/emulator_x86_64/system_ext.prop delete mode 100755 target/board/emulator_x86_64_arm64/BoardConfig.mk delete mode 100755 target/board/emulator_x86_64_arm64/device.mk delete mode 100644 target/board/emulator_x86_64_arm64/system_ext.prop delete mode 100644 target/product/emulator_vendor.mk delete mode 100644 target/product/sdk_phone_arm64.mk delete mode 100644 target/product/sdk_phone_x86_64.mk diff --git a/target/board/emulator_arm64/BoardConfig.mk b/target/board/emulator_arm64/BoardConfig.mk deleted file mode 100644 index c16e61bf53..0000000000 --- a/target/board/emulator_arm64/BoardConfig.mk +++ /dev/null @@ -1,66 +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. -# - -# arm64 emulator specific definitions -TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a -TARGET_CPU_VARIANT := generic -TARGET_CPU_ABI := arm64-v8a - -ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk,$(MAKECMDGOALS)),) -# DO NOT USE -# DO NOT USE -# -# This architecture / CPU variant must NOT be used for any 64 bit -# platform builds. It is the lowest common denominator required -# to build an unbundled application or cts for all supported 32 and 64 bit -# platforms. -# -# If you're building a 64 bit platform (and not an application) the -# ARM-v8 specification allows you to assume all the features available in an -# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant: -# -# TARGET_2ND_ARCH_VARIANT := armv8-a -# TARGET_2ND_CPU_VARIANT := generic -# -# DO NOT USE -# DO NOT USE -TARGET_2ND_ARCH_VARIANT := armv7-a-neon -# DO NOT USE -# DO NOT USE -TARGET_2ND_CPU_VARIANT := generic -# DO NOT USE -# DO NOT USE -else -TARGET_2ND_ARCH_VARIANT := armv8-a -TARGET_2ND_CPU_VARIANT := generic -endif - -include build/make/target/board/BoardConfigGsiCommon.mk -include build/make/target/board/BoardConfigEmuCommon.mk - -BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000 -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_arm64/device.mk b/target/board/emulator_arm64/device.mk deleted file mode 100644 index d221e64159..0000000000 --- a/target/board/emulator_arm64/device.mk +++ /dev/null @@ -1,19 +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_arm64/system_ext.prop b/target/board/emulator_arm64/system_ext.prop deleted file mode 100644 index 2f8f803e4c..0000000000 --- a/target/board/emulator_arm64/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for emulator arm64 sdk -# - -rild.libpath=/vendor/lib64/libreference-ril.so diff --git a/target/board/emulator_x86_64/BoardConfig.mk b/target/board/emulator_x86_64/BoardConfig.mk deleted file mode 100755 index b9cbd8a243..0000000000 --- a/target/board/emulator_x86_64/BoardConfig.mk +++ /dev/null @@ -1,42 +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_64 emulator specific definitions -TARGET_CPU_ABI := x86_64 -TARGET_ARCH := x86_64 -TARGET_ARCH_VARIANT := x86_64 - -TARGET_2ND_CPU_ABI := x86 -TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := x86_64 - -TARGET_PRELINK_MODULE := false -include build/make/target/board/BoardConfigGsiCommon.mk -include build/make/target/board/BoardConfigEmuCommon.mk - -BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 - -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_64/device.mk b/target/board/emulator_x86_64/device.mk deleted file mode 100755 index 8a9d8da921..0000000000 --- a/target/board/emulator_x86_64/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_64/system_ext.prop b/target/board/emulator_x86_64/system_ext.prop deleted file mode 100644 index ed9d1731c7..0000000000 --- a/target/board/emulator_x86_64/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib64/libreference-ril.so diff --git a/target/board/emulator_x86_64_arm64/BoardConfig.mk b/target/board/emulator_x86_64_arm64/BoardConfig.mk deleted file mode 100755 index 26b61a6787..0000000000 --- a/target/board/emulator_x86_64_arm64/BoardConfig.mk +++ /dev/null @@ -1,59 +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_64 emulator specific definitions -TARGET_CPU_ABI := x86_64 -TARGET_ARCH := x86_64 -TARGET_ARCH_VARIANT := x86_64 - -TARGET_2ND_CPU_ABI := x86 -TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := x86_64 - -TARGET_NATIVE_BRIDGE_ARCH := arm64 -TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv8-a -TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic -TARGET_NATIVE_BRIDGE_ABI := arm64-v8a - -TARGET_NATIVE_BRIDGE_2ND_ARCH := arm -TARGET_NATIVE_BRIDGE_2ND_ARCH_VARIANT := armv7-a-neon -TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT := generic -TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi - -BUILD_BROKEN_DUP_RULES := true - -TARGET_PRELINK_MODULE := false - -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_64_arm64/device.mk b/target/board/emulator_x86_64_arm64/device.mk deleted file mode 100755 index af023eb25c..0000000000 --- a/target/board/emulator_x86_64_arm64/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_64_arm64/system_ext.prop b/target/board/emulator_x86_64_arm64/system_ext.prop deleted file mode 100644 index ed9d1731c7..0000000000 --- a/target/board/emulator_x86_64_arm64/system_ext.prop +++ /dev/null @@ -1,5 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib64/libreference-ril.so diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 18b36aa2e1..76b1c58064 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -67,8 +67,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mainline_system_x86_arm.mk \ $(LOCAL_DIR)/ndk.mk \ $(LOCAL_DIR)/sdk.mk \ - $(LOCAL_DIR)/sdk_phone_arm64.mk \ - $(LOCAL_DIR)/sdk_phone_x86_64.mk \ endif diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk deleted file mode 100644 index f71b275b0e..0000000000 --- a/target/product/emulator_vendor.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2012 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. - -# -# This file is included by other product makefiles to add all the -# emulator-related modules to PRODUCT_PACKAGES. -# - -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) - -# need this for gles libraries to load properly -# after moving to /vendor/lib/ -PRODUCT_PACKAGES += \ - vndk-sp - -DEVICE_PACKAGE_OVERLAYS := device/generic/goldfish/overlay - -PRODUCT_CHARACTERISTICS := emulator - -PRODUCT_FULL_TREBLE_OVERRIDE := true - -# goldfish vendor partition configurations -$(call inherit-product-if-exists, device/generic/goldfish/vendor.mk) - -#watchdog tiggers reboot because location service is not -#responding, disble it for now. -#still keep it on internal main (master) as it is still working -#once it is fixed in aosp, remove this block of comment. -#PRODUCT_VENDOR_PROPERTIES += \ -#config.disable_location=true - -# enable Google-specific location features, -# like NetworkLocationProvider and LocationCollector -PRODUCT_SYSTEM_EXT_PROPERTIES += \ - ro.com.google.locationfeatures=1 - -# disable setupwizard -PRODUCT_SYSTEM_EXT_PROPERTIES += \ - ro.setupwizard.mode?=DISABLED diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk deleted file mode 100644 index c16c403c90..0000000000 --- a/target/product/sdk_phone_arm64.mk +++ /dev/null @@ -1,66 +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. - -# Enable mainline checking for exact this product name -ifeq (sdk_phone_arm64,$(TARGET_PRODUCT)) -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -endif - -# -# All components inherited here go to system image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(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 or vendor_boot image -# -$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm64/device.mk) - -# keep this apk for sdk targets for now -PRODUCT_PACKAGES += \ - EmulatorSmokeTests - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_arm64 -PRODUCT_DEVICE := emulator_arm64 -PRODUCT_MODEL := Android SDK built for arm64 -# 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_64.mk b/target/product/sdk_phone_x86_64.mk deleted file mode 100644 index b2e14a5425..0000000000 --- a/target/product/sdk_phone_x86_64.mk +++ /dev/null @@ -1,62 +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/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) - -# Enable mainline checking for exact this product name -ifeq (sdk_phone_x86_64,$(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_64-vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk) - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_x86_64 -PRODUCT_DEVICE := emulator_x86_64 -PRODUCT_MODEL := Android SDK built for x86_64 -# 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