From 9693d8bd60dae655d540be6ae591733980b96348 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 19 Apr 2021 17:23:30 +0100 Subject: [PATCH] Set PRODUCT_SHIPPING_API_LEVEL in module_* This setting doesn't really make sense for unbundled builds but does have the side-effect of turning on "full treble", which in turn is used by some modules (libhidlbase) to conditionally use some particular -D when compiling. The media.swcodec does not work without this define. Bug: 185759877 Bug: 185789027 Test: compare media.swcodec apex build with module_arm64 and aosp_arm64 Merged-In: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa --- target/product/module_common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/module_common.mk b/target/product/module_common.mk index b69f252c8..6b95b2d1f 100644 --- a/target/product/module_common.mk +++ b/target/product/module_common.mk @@ -17,3 +17,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/bootclasspath.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk) + +# Enables treble, which enabled certain -D compilation flags. In particular, libhidlbase +# uses -DENFORCE_VINTF_MANIFEST. See b/185759877 +PRODUCT_SHIPPING_API_LEVEL := 29