Snap for 9499269 from 79c36035bb to udc-release

Change-Id: I1f58a2d40edaf8e2b5445314e92caf436ba8c8a1
This commit is contained in:
Android Build Coastguard Worker 2023-01-18 02:07:40 +00:00
commit 6c3ec98e11
2 changed files with 3 additions and 3 deletions

View file

@ -364,11 +364,11 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_RAMDISK_KERNEL_MODULE
BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE)))
BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
BOARD_VENDOR_KERNEL_MODULES_LOAD += $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD
$(error vendor_dlkm.modules.load not found or empty)
endif
BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES)
# Using BUILD_COPY_HEADERS
BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true

View file

@ -505,7 +505,7 @@ PRODUCT_PACKAGES += \
android.hardware.drm-service.clearkey \
liboemcrypto \
include vendor/widevine/libwvdrmengine/apex/device/device.mk
-include vendor/widevine/libwvdrmengine/apex/device/device.mk
$(call soong_config_set,google3a_config,soc,gs101)
$(call soong_config_set,google3a_config,gcam_awb,true)