From 9fd786cd55100fda596c43bf01bd79de90f8c801 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Fri, 2 Jun 2023 23:40:32 +0100 Subject: [PATCH] Add an allowlist for modules that have broken optional_uses_libs. Bug: 282877248 Test: m nothing Change-Id: I6f0e76a6f147de1e6043b5abc4630342d46bafcc --- core/config.mk | 3 +++ core/soong_config.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/core/config.mk b/core/config.mk index 5457fd2773..12856289a0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1267,6 +1267,9 @@ endif .KATI_READONLY := JAVAC_NINJA_POOL R8_NINJA_POOL D8_NINJA_POOL +# Soong modules that are known to have broken optional_uses_libs dependencies. +BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST := LegacyCamera Gallery2 + # These goals don't need to collect and include Android.mks/CleanSpec.mks # in the source tree. dont_bother_goals := out product-graph diff --git a/core/soong_config.mk b/core/soong_config.mk index 46f06f7f4e..34a434fc7d 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -294,6 +294,8 @@ $(call add_json_bool, BuildBrokenUsesSoongPython2Modules, $(filter true,$(BUILD_ $(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE))) $(call add_json_list, BuildBrokenInputDirModules, $(BUILD_BROKEN_INPUT_DIR_MODULES)) +$(call add_json_list, BuildWarningBadOptionalUsesLibsAllowlist, $(BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST)) + $(call add_json_bool, BuildDebugfsRestrictionsEnabled, $(filter true,$(PRODUCT_SET_DEBUGFS_RESTRICTIONS))) $(call add_json_bool, RequiresInsecureExecmemForSwiftshader, $(filter true,$(PRODUCT_REQUIRES_INSECURE_EXECMEM_FOR_SWIFTSHADER)))