From bd523029a9f70dde5b9b864b98f4c2e173412d05 Mon Sep 17 00:00:00 2001 From: Alfred Piccioni Date: Wed, 25 Oct 2023 13:56:04 +0200 Subject: [PATCH] Remove emulator_x86_arm board from common boards The board will now live in the Android TV vendor partition, since the emulator team is no longer supporting 32-bit boards. Bug: 305610937 Test: Null Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587 Merged-In: Ia1afb35ad15eb991bb2451c160db4f853f016587 --- 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 -- 3 files changed, 75 deletions(-) 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 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