From f945b5df686be7ee0553c633519989cfc6910c0e Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 20 Apr 2023 14:43:03 -0700 Subject: [PATCH] (reland2) Remove emulator dependencies on non emulator targets (2) the sidecar issue in GSI was fixed. Bug: 111538404 Test: presubmit Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438 Signed-off-by: Roman Kiryanov --- target/board/generic/BoardConfig.mk | 17 ---------------- target/board/generic/device.mk | 2 -- .../generic_64bitonly_x86_64/BoardConfig.mk | 20 ------------------- target/board/generic_x86/BoardConfig.mk | 20 ------------------- target/board/generic_x86/device.mk | 3 --- target/board/generic_x86_64/BoardConfig.mk | 20 ------------------- .../board/generic_x86_64_arm64/BoardConfig.mk | 15 -------------- target/board/generic_x86_64_arm64/device.mk | 2 -- target/board/generic_x86_arm/BoardConfig.mk | 15 -------------- target/board/generic_x86_arm/device.mk | 2 -- target/product/aosp_64bitonly_x86_64.mk | 1 - target/product/aosp_arm.mk | 1 - target/product/aosp_arm64.mk | 1 - target/product/aosp_riscv64.mk | 1 - target/product/aosp_x86.mk | 1 - target/product/aosp_x86_64.mk | 1 - target/product/aosp_x86_arm.mk | 1 - target/product/full.manifest.xml | 2 ++ target/product/full.mk | 3 ++- target/product/full_x86.mk | 3 ++- target/product/generic.mk | 3 --- 21 files changed, 6 insertions(+), 128 deletions(-) create mode 100644 target/product/full.manifest.xml diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 87c16daade..6720ddbe6c 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -30,20 +30,3 @@ TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi 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 diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index 76242c90b2..76edf6b411 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -14,5 +14,3 @@ # 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/generic_64bitonly_x86_64/BoardConfig.mk b/target/board/generic_64bitonly_x86_64/BoardConfig.mk index a240eab5ee..a129ea0fd3 100644 --- a/target/board/generic_64bitonly_x86_64/BoardConfig.mk +++ b/target/board/generic_64bitonly_x86_64/BoardConfig.mk @@ -28,23 +28,3 @@ TARGET_2ND_ARCH_VARIANT := x86_64 TARGET_PRELINK_MODULE := false 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 diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 47fd384c26..26bede8d1f 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -19,23 +19,3 @@ TARGET_ARCH := x86 TARGET_ARCH_VARIANT := x86 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 diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 5ad008f119..60f0cc33f1 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -14,9 +14,6 @@ # 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 diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 36136f4b35..64da5783db 100644 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -28,23 +28,3 @@ TARGET_DYNAMIC_64_32_MEDIASERVER := true TARGET_DYNAMIC_64_32_DRMSERVER := true 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 diff --git a/target/board/generic_x86_64_arm64/BoardConfig.mk b/target/board/generic_x86_64_arm64/BoardConfig.mk index f528294fc0..818ec44d2b 100644 --- a/target/board/generic_x86_64_arm64/BoardConfig.mk +++ b/target/board/generic_x86_64_arm64/BoardConfig.mk @@ -13,7 +13,6 @@ # limitations under the License. # -# x86_64 emulator specific definitions TARGET_CPU_ABI := x86_64 TARGET_ARCH := x86_64 TARGET_ARCH_VARIANT := x86_64 @@ -37,23 +36,9 @@ 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/generic_x86_64_arm64/device.mk b/target/board/generic_x86_64_arm64/device.mk index 76242c90b2..76edf6b411 100644 --- a/target/board/generic_x86_64_arm64/device.mk +++ b/target/board/generic_x86_64_arm64/device.mk @@ -14,5 +14,3 @@ # 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/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk index f6589b01e1..62bb5eb1f9 100644 --- a/target/board/generic_x86_arm/BoardConfig.mk +++ b/target/board/generic_x86_arm/BoardConfig.mk @@ -13,7 +13,6 @@ # limitations under the License. # -# x86 emulator specific definitions TARGET_CPU_ABI := x86 TARGET_ARCH := x86 TARGET_ARCH_VARIANT := x86 @@ -30,23 +29,9 @@ BUILD_BROKEN_DUP_RULES := true # 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 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" diff --git a/target/board/generic_x86_arm/device.mk b/target/board/generic_x86_arm/device.mk index 76242c90b2..76edf6b411 100644 --- a/target/board/generic_x86_arm/device.mk +++ b/target/board/generic_x86_arm/device.mk @@ -14,5 +14,3 @@ # 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/product/aosp_64bitonly_x86_64.mk b/target/product/aosp_64bitonly_x86_64.mk index 75fd3c8f17..cf812a22d0 100644 --- a/target/product/aosp_64bitonly_x86_64.mk +++ b/target/product/aosp_64bitonly_x86_64.mk @@ -51,7 +51,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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) # diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 61c13169b9..d9c362eb56 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -50,7 +50,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor image # $(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) # diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 6c907db0ed..d3514a50de 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -54,7 +54,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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)/product/non_ab_device.mk) diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk index 270a989620..fa503fffbd 100644 --- a/target/product/aosp_riscv64.mk +++ b/target/product/aosp_riscv64.mk @@ -46,7 +46,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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) # diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index a2f0390c22..c26a8bf45c 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -47,7 +47,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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) diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 535ee3f0a7..3040dd3473 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -56,7 +56,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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)/product/non_ab_device.mk) diff --git a/target/product/aosp_x86_arm.mk b/target/product/aosp_x86_arm.mk index 39ad0d8d76..a103b1a22c 100644 --- a/target/product/aosp_x86_arm.mk +++ b/target/product/aosp_x86_arm.mk @@ -45,7 +45,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # 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) diff --git a/target/product/full.manifest.xml b/target/product/full.manifest.xml new file mode 100644 index 0000000000..b8b0d37875 --- /dev/null +++ b/target/product/full.manifest.xml @@ -0,0 +1,2 @@ + + diff --git a/target/product/full.mk b/target/product/full.mk index 945957ff81..da04f49a19 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -20,10 +20,11 @@ # entirely appropriate to inherit from for on-device configurations. $(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)/board/generic/device.mk) +DEVICE_MANIFEST_FILE += build/make/target/product/full.manifest.xml + # Enable dynamic partition size PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index 0f3be91764..07f6472844 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -23,10 +23,11 @@ # that isn't a wifi connection. This will instruct init.rc to enable the # 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)/board/generic_x86/device.mk) +DEVICE_MANIFEST_FILE += build/make/target/product/full.manifest.xml + ifdef NET_ETH0_STARTONBOOT PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif diff --git a/target/product/generic.mk b/target/product/generic.mk index fb5b727ba1..fd3b3fb0e7 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -14,9 +14,6 @@ # 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. # It includes the base Android platform.