Merge "Remove emulator_x86_arm board from common boards" into main
This commit is contained in:
commit
b7c0adf543
3 changed files with 0 additions and 75 deletions
|
@ -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"
|
|
|
@ -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.
|
|
|
@ -1,5 +0,0 @@
|
||||||
#
|
|
||||||
# system.prop for generic sdk
|
|
||||||
#
|
|
||||||
|
|
||||||
rild.libpath=/vendor/lib/libreference-ril.so
|
|
Loading…
Reference in a new issue