From 5a6c57b11a9c7b311380f8fae2de6bcb482d3c38 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Sat, 13 May 2023 07:34:07 +0900 Subject: [PATCH] Fix build_test breakage CI build_test target tests every product, which invokes the new widevine_generic product out of the build script. This makes build fail due to the missing TARGET_BASE_PRODUCT. Fix it by fallback to module_arm as base product. Bug: 281617982 Test: TH Change-Id: I36d437a56609865e64aea86c5d3af02887b42bc7 --- libwvdrmengine/apex/device/widevine_generic.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libwvdrmengine/apex/device/widevine_generic.mk b/libwvdrmengine/apex/device/widevine_generic.mk index 933a8831..e16ddb80 100644 --- a/libwvdrmengine/apex/device/widevine_generic.mk +++ b/libwvdrmengine/apex/device/widevine_generic.mk @@ -1,3 +1,8 @@ +ifdef TARGET_BASE_PRODUCT $(call inherit-product, $(TARGET_BASE_PRODUCT)) +else +# Fallback to a valid base product to satisfy build_test +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm.mk) +endif include vendor/widevine/libwvdrmengine/apex/device/device.mk