From aaf7de8484e890d131fe064b0450343a8d3e4ad8 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 02:37:57 +0300 Subject: [PATCH] gs101: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27 --- BoardConfig-common.mk | 2 -- aosp_common.mk | 1 - device-common.mk | 3 -- device.mk | 53 ++---------------------------- telephony/user.mk | 3 -- trusty_metricsd/trusty_metricsd.mk | 3 -- 6 files changed, 3 insertions(+), 62 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index d4381460..992f6d0d 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -401,6 +401,4 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 --include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk - include device/google/gs101/BoardConfigLineage.mk diff --git a/aosp_common.mk b/aosp_common.mk index 5ba98821..4c2d61b2 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -49,7 +49,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/gs101/device.mk) -#$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) # TODO: fix # PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/device-common.mk b/device-common.mk index 4c925e59..623f0299 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/gs101/proprietary/telephony/device-vendor.mk -endif include device/google/gs101/device.mk ifneq ($(BOARD_WITHOUT_RADIO),true) diff --git a/device.mk b/device.mk index ff77de29..9db1747b 100644 --- a/device.mk +++ b/device.mk @@ -62,20 +62,10 @@ BOOT_SECURITY_PATCH := 2025-06-05 PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ - hardware/google/gchips \ - hardware/google/graphics/common \ - hardware/google/gchips/gralloc4 \ - hardware/google/graphics/gs101 \ hardware/google/interfaces \ hardware/google/pixel \ device/google/gs101 \ - device/google/gs101/powerstats \ - vendor/google_devices/common/chre/host/hal \ - vendor/google/whitechapel/tools \ - vendor/google/camera \ - vendor/google/interfaces \ - vendor/google_nos/host/android \ - vendor/google_nos/test/system-test-harness + device/google/gs101/powerstats LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 @@ -83,12 +73,6 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 -ifneq ($(BOARD_WITHOUT_RADIO),true) -# Include vendor telephony soong namespace -PRODUCT_SOONG_NAMESPACES += \ - vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) -endif - include device/google/gs101/modem/user.mk # From system.property @@ -153,7 +137,6 @@ USE_LASSEN_OEMHOOK := true # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. ifneq ($(BOARD_WITHOUT_RADIO),true) - PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) endif @@ -178,9 +161,6 @@ USE_SWIFTSHADER := false # HWUI TARGET_USES_VULKAN = true -PRODUCT_SOONG_NAMESPACES += \ - vendor/arm/mali/gs101 - # Used in gfx_tools when defining tests with composer2 interface for gs101 devices $(call soong_config_set,gfx_tools,use_hwc2,true) @@ -812,13 +792,8 @@ PRODUCT_PACKAGES += \ vts.bin ifneq ($(BOARD_WITHOUT_RADIO),true) -# 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 -$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk) - PRODUCT_PACKAGES += ShannonRcs endif @@ -834,22 +809,12 @@ USE_RADIO_HAL_1_6 := true # Support SecureElement HAL for HIDL USE_SE_HIDL := true -#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) -#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk) - -ifneq ($(BOARD_WITHOUT_RADIO),true) -$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) -endif - ifeq ($(DEVICE_IS_64BIT_ONLY),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) endif -#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) -#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.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 $(call soong_config_set,usf,target_soc,gs101) @@ -893,9 +858,6 @@ PRODUCT_PACKAGES += \ include device/google/gs-common/audio/hidl_gs101.mk ## AoC soong -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/whitechapel/aoc - $(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) @@ -936,16 +898,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,abrolhos) -# Include the edgetpu targets defined the namespaces below into the final image. -PRODUCT_SOONG_NAMESPACES += \ - vendor/google_devices/gs101/proprietary/gchips/tpu/metrics \ - vendor/google_devices/gs101/proprietary/gchips/tpu/tflite_delegate \ - vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \ - vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \ - vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \ - vendor/google_devices/gs101/proprietary/gchips/tpu/hal \ - vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/tachyon_apis \ - vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/service + # TPU firmware PRODUCT_PACKAGES += edgetpu-abrolhos.fw diff --git a/telephony/user.mk b/telephony/user.mk index 0a78f012..a9832f4b 100644 --- a/telephony/user.mk +++ b/telephony/user.mk @@ -1,4 +1 @@ -ifneq ($(wildcard vendor/samsung_slsi/telephony/),) -PRODUCT_COPY_FILES += vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device/samsung/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh -endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/telephony/user/ diff --git a/trusty_metricsd/trusty_metricsd.mk b/trusty_metricsd/trusty_metricsd.mk index ff95a1c6..1d069a44 100644 --- a/trusty_metricsd/trusty_metricsd.mk +++ b/trusty_metricsd/trusty_metricsd.mk @@ -1,6 +1,3 @@ # Trusty Metrics Daemon -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/trusty/common - PRODUCT_PACKAGES += trusty_metricsd BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/trusty_metricsd