Evolution-X-Tensor/device_google_zumapro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zumapro: Remove non-existent vendor includes

Browse source 
Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27
This commit is contained in:
Michael Bestas 2025-06-19 02:37:57 +03:00 • committed by Michael Bestas
parent 1c41b2194a
commit b7af59a402
No known key found for this signature in database
4 changed files with 3 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BoardConfig-common.mk
View file

@ -439,7 +439,4 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K
# Protected VM firmware # Protected VM firmware
BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 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 include device/google/zumapro/BoardConfigLineage.mk

1
aosp_common.mk
View file

@ -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, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
#$(call inherit-product, device/google/zumapro/device.mk) #$(call inherit-product, device/google/zumapro/device.mk)
#$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
# TODO: fix # TODO: fix
# PRODUCT_RESTRICT_VENDOR_FILES := all # PRODUCT_RESTRICT_VENDOR_FILES := all

3
device-common.mk
View file

@ -14,9 +14,6 @@
# limitations under the License. # 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 include device/google/zumapro/device.mk
# Telephony # Telephony

68
device.mk
View file

@ -72,22 +72,10 @@ endif
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
hardware/google/av \ 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/interfaces \
hardware/google/pixel \ hardware/google/pixel \
device/google/zumapro \ device/google/zumapro \
device/google/zumapro/powerstats \ 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
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
@ -98,12 +86,6 @@ TRUSTY_KEYMINT_IMPL := rust
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 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 # From system.property
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.telephony.default_network=27 \ ro.telephony.default_network=27 \
@ -199,11 +181,8 @@ include hardware/google/pixel/PixelLogger/PixelLogger.mk
ifneq ($(BOARD_WITHOUT_RADIO),true) ifneq ($(BOARD_WITHOUT_RADIO),true)
# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. # $(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 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 # modem_ml_svc_sit daemon
PRODUCT_PACKAGES += modem_ml_svc_sit PRODUCT_PACKAGES += modem_ml_svc_sit
@ -269,11 +248,6 @@ USE_GOOGLE_DIALER := true
USE_GOOGLE_CARRIER_SETTINGS := true USE_GOOGLE_CARRIER_SETTINGS := true
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.uses_google_dialer_carrier_settings=1 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 endif
ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true)
@ -297,15 +271,6 @@ else
TARGET_USES_VULKAN = true TARGET_USES_VULKAN = true
endif 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)) $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
# TODO (b/297408842): The gralloc is being open-sourced, and we cannot pass # 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. # "zumapro" as SOC to build it. Pass "zuma" as SOC for now.
@ -431,9 +396,6 @@ endif
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay 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 # Enforce the Product interface
PRODUCT_PRODUCT_VNDK_VERSION := current PRODUCT_PRODUCT_VNDK_VERSION := current
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true 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) $(call inherit-product, system/core/trusty/trusty-base.mk)
# Trusty Metrics Daemon # Trusty Metrics Daemon
PRODUCT_SOONG_NAMESPACES += \
vendor/google/trusty/common
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
trusty_metricsd trusty_metricsd
@ -984,9 +943,6 @@ PRODUCT_PACKAGES += \
calliope_iva.bin \ calliope_iva.bin \
vts.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 += ShannonIms
PRODUCT_PACKAGES += ShannonRcs PRODUCT_PACKAGES += ShannonRcs
@ -1006,14 +962,8 @@ USE_EARLY_SEND_DEVICE_INFO := true
# Using New Radio Access Format to modem # Using New Radio Access Format to modem
USE_NEW_RADIO_ACCESS_SPECIFIER_FORMAT := true 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, $(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 include device/google/gs-common/sensors/sensors.mk
# Zuma Pro USF configuration is identical to Zuma # Zuma Pro USF configuration is identical to Zuma
$(call soong_config_set,usf,target_soc,zuma) $(call soong_config_set,usf,target_soc,zuma)
@ -1039,9 +989,6 @@ include device/google/gs-common/audio/hidl_zuma.mk
endif endif
## AoC soong ## AoC soong
PRODUCT_SOONG_NAMESPACES += \
vendor/google/whitechapel/aoc
$(call soong_config_set,aoc,target_soc,zumapro) $(call soong_config_set,aoc,target_soc,zumapro)
$(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) $(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 include device/google/gs-common/edgetpu/edgetpu.mk
# Config variables for TPU chip on device. # Config variables for TPU chip on device.
$(call soong_config_set,edgetpu_config,chip,rio_pro) $(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 # TPU firmware
PRODUCT_PACKAGES += edgetpu-rio.fw PRODUCT_PACKAGES += edgetpu-rio.fw