diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index e57839f6..4d26894b 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -440,7 +440,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/zuma/BoardConfigLineage.mk diff --git a/aosp_common.mk b/aosp_common.mk index d2942d0c..0a6d58d4 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/zuma/device.mk) -#$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) # TODO: fix # PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/device-common.mk b/device-common.mk index 7f0b6b67..3a56e426 100644 --- a/device-common.mk +++ b/device-common.mk @@ -14,7 +14,6 @@ # limitations under the License. # --include vendor/google_devices/zuma/proprietary/telephony/device-vendor.mk include device/google/zuma/device.mk # Telephony diff --git a/device.mk b/device.mk index b978dc97..cf572a7f 100644 --- a/device.mk +++ b/device.mk @@ -73,22 +73,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/zuma/libhwc2.1 \ hardware/google/interfaces \ hardware/google/pixel \ device/google/zuma \ - device/google/zuma/powerstats \ - vendor/google_devices/common/chre/host/hal \ - vendor/google_devices/zuma/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/zuma/powerstats LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 @@ -104,10 +92,6 @@ endif PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 -# Include vendor telephony soong namespace -PRODUCT_SOONG_NAMESPACES += \ - vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) - # From system.property PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ @@ -196,7 +180,6 @@ USE_LASSEN_OEMHOOK := true # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. ifneq ($(BOARD_WITHOUT_RADIO),true) $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) - PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril endif # Use for GRIL @@ -209,8 +192,6 @@ endif ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true USE_GOOGLE_CARRIER_SETTINGS := true -# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true" -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zuma/proprietary/GoogleDialer endif ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) @@ -229,16 +210,6 @@ USE_SWIFTSHADER := false # HWUI TARGET_USES_VULKAN = true -# "vendor/arm" doesn't exist in PDK build -ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp)) -PRODUCT_SOONG_NAMESPACES += \ - vendor/google_devices/zuma/prebuilts/firmware/gpu \ - vendor/google_devices/zuma/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,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM)) @@ -336,9 +307,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/zuma/overlay # This device is shipped with 34 (Android U) PRODUCT_SHIPPING_API_LEVEL := 34 -# 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 @@ -731,8 +699,6 @@ WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled #################################### # Video -PRODUCT_SOONG_NAMESPACES += vendor/google/media/bigwave - $(call soong_config_set,bigw,soc,$(TARGET_BOARD_PLATFORM)) PRODUCT_PACKAGES += \ @@ -809,9 +775,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 @@ -871,9 +834,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 @@ -893,18 +853,8 @@ USE_RADIO_HAL_2_1 := true # Using Early Send Device Info USE_EARLY_SEND_DEVICE_INFO := true -#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) -#$(call inherit-product, vendor/google_devices/zuma/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 - $(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/zuma/zuma.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,zuma) @@ -981,9 +931,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,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) @@ -1023,16 +970,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) -# Include the edgetpu targets defined the namespaces below into the final image. -PRODUCT_SOONG_NAMESPACES += \ - vendor/google_devices/zuma/proprietary/gchips/tpu/metrics \ - vendor/google_devices/zuma/proprietary/gchips/tpu/tflite_delegate \ - vendor/google_devices/zuma/proprietary/gchips/tpu/darwinn_logging_service \ - vendor/google_devices/zuma/proprietary/gchips/tpu/nnapi_stable_aidl \ - vendor/google_devices/zuma/proprietary/gchips/tpu/aidl \ - vendor/google_devices/zuma/proprietary/gchips/tpu/hal \ - vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/tachyon_apis \ - vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/service + # TPU firmware PRODUCT_PACKAGES += edgetpu-rio.fw