Snap for 12872597 from 9618d96251 to mainline-tzdata6-release

Change-Id: Ife65d3033d83f003151d3778695edc80b926d648
This commit is contained in:
Android Build Coastguard Worker 2025-01-06 04:36:17 -08:00
commit 26e6c490d0
4 changed files with 14 additions and 4 deletions

View file

@ -163,7 +163,7 @@ PRODUCT_PACKAGES += \
SHARED_MODEM_PLATFORM_VENDOR := lassen SHARED_MODEM_PLATFORM_VENDOR := lassen
# Shared Modem Platform # Shared Modem Platform
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -364,3 +364,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif endif
endif endif
# PlayVideos
PLAYVIDEOS_VERSION_DIR := 4.20.6
$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)

View file

@ -168,7 +168,7 @@ PRODUCT_PACKAGES += \
SHARED_MODEM_PLATFORM_VENDOR := lassen SHARED_MODEM_PLATFORM_VENDOR := lassen
# Shared Modem Platform # Shared Modem Platform
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -373,3 +373,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif endif
endif endif
# PlayVideos
PLAYVIDEOS_VERSION_DIR := 4.20.6
$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)

View file

@ -99,7 +99,7 @@ PRODUCT_PACKAGES += \
SHARED_MODEM_PLATFORM_VENDOR := lassen SHARED_MODEM_PLATFORM_VENDOR := lassen
# Shared Modem Platform # Shared Modem Platform
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View file

@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \
SHARED_MODEM_PLATFORM_VENDOR := lassen SHARED_MODEM_PLATFORM_VENDOR := lassen
# Shared Modem Platform # Shared Modem Platform
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
# PowerStats HAL # PowerStats HAL
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin