StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove emulator dependencies on non emulator targets (2)"

Browse Source 
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
This commit is contained in:
Richard Xie
2023-05-03 20:56:52 +00:00
committed by Gerrit Code Review
parent d82931f9aa
commit 02b9b9e194
20 changed files with 128 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
target/board/generic/BoardConfig.mk
View File

@@ -30,3 +30,20 @@ TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi TARGET_CPU_ABI2 := armeabi
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
ifndef BUILDING_GSI
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"
endif

2
target/board/generic/device.mk
View File

@@ -14,3 +14,5 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

20
target/board/generic_64bitonly_x86_64/BoardConfig.mk
View File

@@ -28,3 +28,23 @@ TARGET_2ND_ARCH_VARIANT := x86_64
TARGET_PRELINK_MODULE := false TARGET_PRELINK_MODULE := false
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
ifndef BUILDING_GSI
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"
endif # !BUILDING_GSI

20
target/board/generic_x86/BoardConfig.mk
View File

@@ -19,3 +19,23 @@ TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
ifndef BUILDING_GSI
include build/make/target/board/BoardConfigEmuCommon.mk
# Resize to 4G to accomodate 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"
endif

3
target/board/generic_x86/device.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # 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 ifdef NET_ETH0_STARTONBOOT
PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1
endif endif

20
target/board/generic_x86_64/BoardConfig.mk
View File

@@ -26,3 +26,23 @@ TARGET_2ND_ARCH_VARIANT := x86_64
TARGET_DYNAMIC_64_32_MEDIASERVER := true TARGET_DYNAMIC_64_32_MEDIASERVER := true
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
ifndef BUILDING_GSI
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"
endif # !BUILDING_GSI

15
target/board/generic_x86_64_arm64/BoardConfig.mk
View File

@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
# #
# x86_64 emulator specific definitions
TARGET_CPU_ABI := x86_64 TARGET_CPU_ABI := x86_64
TARGET_ARCH := x86_64 TARGET_ARCH := x86_64
TARGET_ARCH_VARIANT := x86_64 TARGET_ARCH_VARIANT := x86_64
@@ -36,9 +37,23 @@ BUILD_BROKEN_DUP_RULES := true
TARGET_PRELINK_MODULE := false TARGET_PRELINK_MODULE := false
include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigMainlineCommon.mk
include build/make/target/board/BoardConfigEmuCommon.mk
# the settings differ from BoardConfigMainlineCommon.mk # the settings differ from BoardConfigMainlineCommon.mk
BOARD_USES_SYSTEM_OTHER_ODEX := BOARD_USES_SYSTEM_OTHER_ODEX :=
# Resize to 4G to accommodate ASAN and CTS # Resize to 4G to accommodate ASAN and CTS
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 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"

2
target/board/generic_x86_64_arm64/device.mk
View File

@@ -14,3 +14,5 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

15
target/board/generic_x86_arm/BoardConfig.mk
View File

@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
# #
# x86 emulator specific definitions
TARGET_CPU_ABI := x86 TARGET_CPU_ABI := x86
TARGET_ARCH := x86 TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
@@ -29,9 +30,23 @@ BUILD_BROKEN_DUP_RULES := true
# The settings in latter makefiles overwrite those in the former. # The settings in latter makefiles overwrite those in the former.
# #
include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigMainlineCommon.mk
include build/make/target/board/BoardConfigEmuCommon.mk
# the settings differ from BoardConfigMainlineCommon.mk # the settings differ from BoardConfigMainlineCommon.mk
BOARD_USES_SYSTEM_OTHER_ODEX := BOARD_USES_SYSTEM_OTHER_ODEX :=
# Resize to 4G to accomodate ASAN and CTS # Resize to 4G to accomodate ASAN and CTS
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 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"

2
target/board/generic_x86_arm/device.mk
View File

@@ -14,3 +14,5 @@
# limitations under the License. # 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
target/product/aosp_64bitonly_x86_64.mk
View File

@@ -51,6 +51,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
# #

1
target/product/aosp_arm.mk
View File

@@ -50,6 +50,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) $(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/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# #

1
target/product/aosp_arm64.mk
View File

@@ -54,6 +54,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor or vendor_boot image # All components inherited here go to vendor or vendor_boot image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)

1
target/product/aosp_riscv64.mk
View File

@@ -46,6 +46,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk)
# #

1
target/product/aosp_x86.mk
View File

@@ -47,6 +47,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)

1
target/product/aosp_x86_64.mk
View File

@@ -56,6 +56,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)

1
target/product/aosp_x86_arm.mk
View File

@@ -45,6 +45,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_arm/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_arm/device.mk)

1
target/product/full.mk
View File

@@ -20,6 +20,7 @@
# entirely appropriate to inherit from for on-device configurations. # entirely appropriate to inherit from for on-device configurations.
$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) $(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)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)

1
target/product/full_x86.mk
View File

@@ -23,6 +23,7 @@
# that isn't a wifi connection. This will instruct init.rc to enable the # that isn't a wifi connection. This will instruct init.rc to enable the
# network connection so that you can use it with ADB # network connection so that you can use it with ADB
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)

3
target/product/generic.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# This is a generic phone product that isn't specialized for a specific device. # This is a generic phone product that isn't specialized for a specific device.
# It includes the base Android platform. # It includes the base Android platform.