Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf479f6 authored by Roman Kiryanov's avatar Roman Kiryanov
Browse files

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: default avatarRoman Kiryanov <rkir@google.com>
parent 52c2ea6a

target/board/emulator_arm64/BoardConfig.mk

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
# 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"

target/board/emulator_arm64/device.mk

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#

# 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.

target/board/emulator_arm64/system_ext.prop

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#

# system.prop for emulator arm64 sdk

#



rild.libpath=/vendor/lib64/libreference-ril.so

target/board/emulator_x86_64/BoardConfig.mk

deleted100755 → 0
+0 −42
Original line number Diff line number Diff line 
# 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"

target/board/emulator_x86_64/device.mk

deleted100755 → 0
+0 −27
Original line number Diff line number Diff line 
#

# 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 \