From b7af59a4025e9feccbacdd89b294583613e199f7 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 02:37:57 +0300 Subject: [PATCH] zumapro: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27 --- BoardConfig-common.mk | 3 -- aosp_common.mk | 1 - device-common.mk | 3 -- device.mk | 68 ++----------------------------------------- 4 files changed, 3 insertions(+), 72 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 644a3a6..c1334bf 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -439,7 +439,4 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 -# pick up library for cleaning digital car keys on factory reset --include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk - include device/google/zumapro/BoardConfigLineage.mk diff --git a/aosp_common.mk b/aosp_common.mk index 2f9d1f6..c8cb9f2 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -42,7 +42,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) #$(call inherit-product, device/google/zumapro/device.mk) -#$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) # TODO: fix # PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/device-common.mk b/device-common.mk index fc89a8c..6217fde 100644 --- a/device-common.mk +++ b/device-common.mk @@ -14,9 +14,6 @@ # limitations under the License. # -ifneq ($(BOARD_WITHOUT_RADIO), true) --include vendor/google_devices/zumapro/proprietary/telephony/device-vendor.mk -endif include device/google/zumapro/device.mk # Telephony diff --git a/device.mk b/device.mk index 1770391..7ffc495 100644 --- a/device.mk +++ b/device.mk @@ -72,22 +72,10 @@ endif PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ - hardware/google/gchips \ - hardware/google/gchips/gralloc4 \ - hardware/google/graphics/common \ - hardware/google/graphics/zuma \ - hardware/google/graphics/zumapro/libhwc2.1 \ hardware/google/interfaces \ hardware/google/pixel \ device/google/zumapro \ - device/google/zumapro/powerstats \ - vendor/google_devices/common/chre/host/hal \ - vendor/google_devices/zumapro/proprietary/debugpolicy \ - vendor/google/whitechapel/tools \ - vendor/google/interfaces \ - vendor/google_nos/host/android \ - vendor/google_nos/test/system-test-harness \ - vendor/google/camera + device/google/zumapro/powerstats LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 @@ -98,12 +86,6 @@ TRUSTY_KEYMINT_IMPL := rust PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 -# Include vendor telephony soong namespace -ifneq ($(BOARD_WITHOUT_RADIO), true) -PRODUCT_SOONG_NAMESPACES += \ - vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) -endif - # From system.property PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ @@ -199,11 +181,8 @@ include hardware/google/pixel/PixelLogger/PixelLogger.mk ifneq ($(BOARD_WITHOUT_RADIO),true) # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. -PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) -$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) - # modem_ml_svc_sit daemon PRODUCT_PACKAGES += modem_ml_svc_sit @@ -269,11 +248,6 @@ USE_GOOGLE_DIALER := true USE_GOOGLE_CARRIER_SETTINGS := true PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.uses_google_dialer_carrier_settings=1 -# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true" -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zumapro/proprietary/GoogleDialer - -# Use prebuilt PixelImsMediaFramework.jar for PDK build -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/gs-common/prebuilts/ImsMedia endif ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) @@ -297,15 +271,6 @@ else TARGET_USES_VULKAN = true endif -# "vendor/arm" doesn't exist in PDK build -ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp)) -PRODUCT_SOONG_NAMESPACES += \ - vendor/google_devices/zumapro/prebuilts/gpu -else -PRODUCT_SOONG_NAMESPACES += \ - vendor/arm/mali/valhall -endif - $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) # TODO (b/297408842): The gralloc is being open-sourced, and we cannot pass # "zumapro" as SOC to build it. Pass "zuma" as SOC for now. @@ -431,9 +396,6 @@ endif DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay -# RKP VINTF --include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk - # Enforce the Product interface PRODUCT_PRODUCT_VNDK_VERSION := current PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true @@ -921,9 +883,6 @@ $(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty Metrics Daemon -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/trusty/common - PRODUCT_PACKAGES += \ trusty_metricsd @@ -984,9 +943,6 @@ PRODUCT_PACKAGES += \ calliope_iva.bin \ vts.bin -# This will be called only if IMSService is building with source code for dev branches. -$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk) - PRODUCT_PACKAGES += ShannonIms PRODUCT_PACKAGES += ShannonRcs @@ -1006,14 +962,8 @@ USE_EARLY_SEND_DEVICE_INFO := true # Using New Radio Access Format to modem USE_NEW_RADIO_ACCESS_SPECIFIER_FORMAT := true -#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) -#$(call inherit-product, vendor/google_devices/zumapro/proprietary/device-vendor.mk) - $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) -#$(call inherit-product-if-exists, hardware/google_devices/zumapro/zumapro.mk) -#$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) -#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) + include device/google/gs-common/sensors/sensors.mk # Zuma Pro USF configuration is identical to Zuma $(call soong_config_set,usf,target_soc,zuma) @@ -1039,9 +989,6 @@ include device/google/gs-common/audio/hidl_zuma.mk endif ## AoC soong -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/whitechapel/aoc - $(call soong_config_set,aoc,target_soc,zumapro) $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) @@ -1087,16 +1034,7 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true include device/google/gs-common/edgetpu/edgetpu.mk # Config variables for TPU chip on device. $(call soong_config_set,edgetpu_config,chip,rio_pro) -# Include the edgetpu targets defined the namespaces below into the final image. -PRODUCT_SOONG_NAMESPACES += \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/metrics \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/tflite_delegate \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/darwinn_logging_service \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/nnapi_stable_aidl \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/aidl \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/hal \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/tachyon/tachyon_apis \ - vendor/google_devices/zumapro/proprietary/gchips/tpu/tachyon/service + # TPU firmware PRODUCT_PACKAGES += edgetpu-rio.fw