From 02b9cc144cee0effec245432ef29f4a15360f899 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 02:37:57 +0300 Subject: [PATCH] gs-common: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27 --- aoc/aoc.mk | 5 -- audio/common.mk | 5 -- battery_mitigation/bcl.mk | 3 +- bcmbt/bluetooth.mk | 1 - bluetooth/bluetooth.mk | 1 - camera/lyric.mk | 43 ---------- dauntless/gsc.mk | 86 -------------------- gps/brcm/device.mk | 1 - input/gia/gia.mk | 4 - mediacodec/bigwave/mediacodec_bigwave.mk | 2 - mediacodec/samsung/mediacodec_samsung.mk | 2 - modem/radio_ext/radio_ext.mk | 1 - pixel_ril/ril.mk | 4 - ramdump_and_coredump/ramdump_and_coredump.mk | 1 - sensors/sensors.mk | 2 - touch/twoshay/twoshay.mk | 1 - widevine/widevine.mk | 2 - wireless_charger/wireless_charger.mk | 1 - 18 files changed, 1 insertion(+), 164 deletions(-) diff --git a/aoc/aoc.mk b/aoc/aoc.mk index 6a9a8ec..210bd45 100644 --- a/aoc/aoc.mk +++ b/aoc/aoc.mk @@ -7,8 +7,3 @@ PRODUCT_PACKAGES += dump_aoc \ # If AoC Daemon is not present on this build, load firmware at boot via rc PRODUCT_COPY_FILES += \ device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc - -ifneq ($(wildcard vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml),) -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \ - vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml -endif diff --git a/audio/common.mk b/audio/common.mk index a691f0a..f432a0c 100644 --- a/audio/common.mk +++ b/audio/common.mk @@ -27,9 +27,4 @@ PRODUCT_COPY_FILES += \ endif -## TODO(b/271958194): separate for hidl and aidl. -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/whitechapel/audio/hal \ - vendor/google/whitechapel/audio/interfaces - $(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM)) diff --git a/battery_mitigation/bcl.mk b/battery_mitigation/bcl.mk index 62838c2..b8ed534 100644 --- a/battery_mitigation/bcl.mk +++ b/battery_mitigation/bcl.mk @@ -7,8 +7,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.battery_mitigation.aidl.enable=true endif -PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation \ - vendor/google/battery_mitigation +PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation PRODUCT_PACKAGES += vendor.google.battery_mitigation-default PRODUCT_PACKAGES += vendor.google.battery_mitigation.service_static DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/battery_mitigation/compatibility_matrix.xml diff --git a/bcmbt/bluetooth.mk b/bcmbt/bluetooth.mk index a2fb3ab..1896cf6 100644 --- a/bcmbt/bluetooth.mk +++ b/bcmbt/bluetooth.mk @@ -1,4 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ android.hardware.bluetooth-V1-ndk.so \ android.hardware.bluetooth.finder-V1-ndk.so \ diff --git a/bluetooth/bluetooth.mk b/bluetooth/bluetooth.mk index 29ddb9c..c0f043a 100644 --- a/bluetooth/bluetooth.mk +++ b/bluetooth/bluetooth.mk @@ -1,4 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/connectivity/bluetooth/common PRODUCT_PACKAGES += \ android.hardware.bluetooth-V1-ndk.so \ android.hardware.bluetooth.finder-V1-ndk.so \ diff --git a/camera/lyric.mk b/camera/lyric.mk index cc046ed..88ca30a 100644 --- a/camera/lyric.mk +++ b/camera/lyric.mk @@ -8,49 +8,6 @@ $(call soong_config_set,google3a_config,ghawb_truetone,true) # Flag controls whether Lyric apex can be located in the dist-directory. $(call soong_config_set, lyric, dist_lyric_apex, $(RELEASE_PIXEL_DIST_LYRIC_APEX)) -# Select GCH backend. -# TODO(b/192681010): This dependency inversion should be removed. -ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) -$(call soong_config_set,gch,hwl_library,lyric) -endif - -# Use build-time flag to select whether to build from source -# or ingest prebuilt-apex. We would want the development teams -# using release configuration: (trunk-staging) to build from source. -# All shipping releases will switch to prebuilts (trunk+) -# if this condition is not true, then build from source. - -# Fallback if the prebuilts directory does not exist, then we must -# build from source no matter what, so we log a warning -ifeq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true) - ifeq ($(wildcard vendor/google/services/LyricCameraHAL/prebuilt),) - $(warning Lyric prebuilt directory is missing, it will be built from source) - BUILD_LYRIC_FROM_SOURCE := true - else - BUILD_LYRIC_FROM_SOURCE := false - endif -else - BUILD_LYRIC_FROM_SOURCE := true -endif # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT - -ifeq ($(BUILD_LYRIC_FROM_SOURCE),true) -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/camera \ - vendor/google/camera/google_3a/libs_v4 \ - vendor/google/camera/rlsservice - -# TODO(b/257379485): 3A is incrementally enabling cuttlefish build for native -# code coverage support, temporary require separate namespace for folders that -# can be built successfully. -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/camera/common/g3_shared \ - vendor/google/camera/google_3a/libs_v4/g3ABase \ - vendor/google/camera/google_3a/libs_v4/gABC/native_coverage \ - vendor/google/camera/google_3a/libs_v4/gAF \ - vendor/google/camera/google_3a/libs_v4/gafd \ - vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage -endif # BUILD_LYRIC_FROM_SOURCE - # Init-time log settings for Google 3A PRODUCT_PACKAGES += libg3a_standalone_gabc_rc PRODUCT_PACKAGES += libg3a_standalone_gaf_rc diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk index 9e1898a..80f115a 100644 --- a/dauntless/gsc.mk +++ b/dauntless/gsc.mk @@ -1,88 +1,2 @@ # Dauntless BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy -ifneq ($(wildcard vendor/google_nos),) -PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless - -PRODUCT_PACKAGES += \ - citadeld \ - citadel_updater \ - android.hardware.weaver-service.citadel \ - android.hardware.authsecret-service.citadel \ - android.hardware.oemlock-service.citadel \ - init_citadel \ - android.hardware.strongbox_keystore.xml \ - android.hardware.security.keymint-service.citadel \ - dump_gsc.sh - -# Assign default value for RELEASE_GOOGLE_DAUNTLESS_DIR if no trunk flags support -RELEASE_GOOGLE_DAUNTLESS_DIR ?= vendor/google_nos/prebuilts/dauntless - -# The production Dauntless firmware will be of flavors evt and d3m2. -# There are also several flavors of pre-release chips. Each flavor -# (production and pre-release) requires the firmware to be signed differently. -DAUNTLESS_FIRMWARE_SIZE := 1048576 - -# The nearly-production Dauntless chips are "proto1.1" -ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin)) -$(error GSC firmware size check fail) -endif -PRODUCT_COPY_FILES += \ - $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/proto11.ec.bin -$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin) -else -$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR)) -endif - -# The production Dauntless chips are "evt" -ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin)) -$(error GSC firmware size check fail) -endif -PRODUCT_COPY_FILES += \ - $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/evt.ec.bin -$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin) -else -$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR)) -endif - -# New 2023 production Dauntless chips are "d3m2" -ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin)) -$(error GSC firmware size check fail) -endif -PRODUCT_COPY_FILES += \ - $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/d3m2.ec.bin -$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin) -else -$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR)) -endif - -# Intermediate image artifacts are published, but aren't included in /vendor/firmware/dauntless -# in PRODUCT_COPY_FILES -# This is because intermediate images aren't needed on user devices, but the published artifact -# is useful for flashstation purposes. - -# proto11 chips need an intermediate image prior to upgrading to newever versions of the firmware -ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin)) -$(error GSC firmware size check fail) -endif -$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin) -endif -# evt chips need an intermediate image prior to upgrading to newever versions of the firmware -ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin)) -$(error GSC firmware size check fail) -endif -$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin) -endif -# d3m2 chips need an intermediate image prior to upgrading to newever versions of the firmware -ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin)) -ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin)) -$(error GSC firmware size check fail) -endif -$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin) -endif - -endif # $(wildcard vendor/google_nos) diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index 9f094ab..4168e4e 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -1,6 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy -PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765 ifeq (,$(call soong_config_get,gpssdk,sdkv1)) $(call soong_config_set,gpssdk,sdkv1,false) endif diff --git a/input/gia/gia.mk b/input/gia/gia.mk index febac5b..0cfb0d3 100644 --- a/input/gia/gia.mk +++ b/input/gia/gia.mk @@ -10,10 +10,6 @@ ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) PRODUCT_PACKAGES += gia PRODUCT_PACKAGES += com.google.input.gia.giaservicemanager - PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces - PRODUCT_SOONG_NAMESPACES += vendor/google/input/gia/core - PRODUCT_SOONG_NAMESPACES += vendor/google/input/gia/core-servicemanager - DEVICE_MANIFEST_FILE += device/google/gs-common/input/gia/aidl/manifest.xml DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/input/gia/aidl/compatibility_matrix.xml endif diff --git a/mediacodec/bigwave/mediacodec_bigwave.mk b/mediacodec/bigwave/mediacodec_bigwave.mk index 4268e53..2ba72c2 100644 --- a/mediacodec/bigwave/mediacodec_bigwave.mk +++ b/mediacodec/bigwave/mediacodec_bigwave.mk @@ -1,5 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/media/bigwave - PRODUCT_PACKAGES += \ google.hardware.media.c2@2.0-service \ libgc2_bw_store \ diff --git a/mediacodec/samsung/mediacodec_samsung.mk b/mediacodec/samsung/mediacodec_samsung.mk index 96ffac4..8e00278 100644 --- a/mediacodec/samsung/mediacodec_samsung.mk +++ b/mediacodec/samsung/mediacodec_samsung.mk @@ -1,5 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/samsung_slsi/codec2 - PRODUCT_PACKAGES += \ samsung.hardware.media.c2@1.2-service \ codec2.vendor.base.policy \ diff --git a/modem/radio_ext/radio_ext.mk b/modem/radio_ext/radio_ext.mk index 1df3bcc..cd8c6a3 100644 --- a/modem/radio_ext/radio_ext.mk +++ b/modem/radio_ext/radio_ext.mk @@ -1,4 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces PRODUCT_PACKAGES += vendor.google.radio_ext-service DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/modem/radio_ext/compatibility_matrix.xml diff --git a/pixel_ril/ril.mk b/pixel_ril/ril.mk index a57d678..f90e926 100644 --- a/pixel_ril/ril.mk +++ b/pixel_ril/ril.mk @@ -9,8 +9,4 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/pixel_ril/co PRODUCT_PACKAGES += ril-extension -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/tools/ril-extension-service \ - vendor/google/tools/ril-mem-monitor - USE_GOOGLE_RIL_EXT := true diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk index 3df9fd3..b8b6f7a 100644 --- a/ramdump_and_coredump/ramdump_and_coredump.mk +++ b/ramdump_and_coredump/ramdump_and_coredump.mk @@ -10,4 +10,3 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/ramdump_and_coredump/sepol # sscoredump PRODUCT_PROPERTY_OVERRIDES += vendor.debug.ssrdump.type=sscoredump -PRODUCT_SOONG_NAMESPACES += vendor/google/tools/subsystem-coredump diff --git a/sensors/sensors.mk b/sensors/sensors.mk index 54ee2f8..b350a6a 100644 --- a/sensors/sensors.mk +++ b/sensors/sensors.mk @@ -1,5 +1,3 @@ -$(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk) - PRODUCT_PACKAGES += dump_sensors BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/sensors/sepolicy diff --git a/touch/twoshay/twoshay.mk b/touch/twoshay/twoshay.mk index bae0975..560ef5c 100644 --- a/touch/twoshay/twoshay.mk +++ b/touch/twoshay/twoshay.mk @@ -1,3 +1,2 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/twoshay/sepolicy PRODUCT_PACKAGES += twoshay -PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces vendor/google/input/twoshay diff --git a/widevine/widevine.mk b/widevine/widevine.mk index c59c7b9..1e34c5a 100644 --- a/widevine/widevine.mk +++ b/widevine/widevine.mk @@ -1,4 +1,2 @@ PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey \ - --include vendor/widevine/libwvdrmengine/apex/device/device.mk \ No newline at end of file diff --git a/wireless_charger/wireless_charger.mk b/wireless_charger/wireless_charger.mk index a2dc27c..4a9b33a 100644 --- a/wireless_charger/wireless_charger.mk +++ b/wireless_charger/wireless_charger.mk @@ -1,4 +1,3 @@ -PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces PRODUCT_PACKAGES += vendor.google.wireless_charger-default PRODUCT_PACKAGES += vendor.google.wireless_charger.service-default DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml