From 45bf2811cfb86b6dd7db57db125be9f375ed18e5 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Fri, 13 Jan 2023 22:49:38 +0000
Subject: [PATCH 1/2] Fix widevine device.mk not found in no vendor repo

Bug: 265342962
Test: git_master-without-vendor
Change-Id: I228f994817ea3f0ff0202403334adf0b30a069c1
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 217d1b66..e2fa1695 100644
--- a/device.mk
+++ b/device.mk
@@ -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)

From 79c36035bbb5b57043ba06b05abb290c624f4818 Mon Sep 17 00:00:00 2001
From: Yu Shan <shanyu@google.com>
Date: Tue, 3 Jan 2023 11:29:46 -0800
Subject: [PATCH 2/2] Append vendor kernel modules in mk file.

Append vendor kernel modules variable instead of overwriting it.
Otherwise, the global variables set by other board specific makefile
will be overwritten.

Test: Manual build and verify kernel module is appended correctly.
Bug: 260153425
Change-Id: I574be28ca6fd345ba717e424dd32eb6e30fb4f34
---
 BoardConfig-common.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index fa3d102e..1e4400ad 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -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