diff options
| -rw-r--r-- | core/config.mk | 11 | ||||
| -rw-r--r-- | core/dex_preopt_config.mk | 16 | ||||
| -rw-r--r-- | core/product.mk | 3 |
3 files changed, 19 insertions, 11 deletions
diff --git a/core/config.mk b/core/config.mk index 6a99a6c7f9..00b3fcf129 100644 --- a/core/config.mk +++ b/core/config.mk @@ -479,17 +479,6 @@ USE_PREBUILT_SDK_TOOLS_IN_PLACE := true USE_D8 := true .KATI_READONLY := USE_D8 -# Whether to fail immediately if verify_uses_libraries check fails, or to keep -# going and restrict dexpreopt to not compile any code for the failed module. -# -# The intended use case for this flag is to have a smoother migration path for -# the Java modules that need to add <uses-library> information in their build -# files. The flag allows to quickly silence build errors. This flag should be -# used with caution and only as a temporary measure, as it masks real errors -# and affects performance. -RELAX_USES_LIBRARY_CHECK ?= false -.KATI_READONLY := RELAX_USES_LIBRARY_CHECK - # # Tools that are prebuilts for TARGET_BUILD_USE_PREBUILT_SDKS # diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index dda7de01fc..36fa6296f0 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -20,6 +20,22 @@ endif # The default value for LOCAL_DEX_PREOPT DEX_PREOPT_DEFAULT ?= $(ENABLE_PREOPT) +# Whether to fail immediately if verify_uses_libraries check fails, or to keep +# going and restrict dexpreopt to not compile any code for the failed module. +# +# The intended use case for this flag is to have a smoother migration path for +# the Java modules that need to add <uses-library> information in their build +# files. The flag allows to quickly silence build errors. This flag should be +# used with caution and only as a temporary measure, as it masks real errors +# and affects performance. +ifndef RELAX_USES_LIBRARY_CHECK + RELAX_USES_LIBRARY_CHECK := $(if \ + $(filter true,$(PRODUCT_BROKEN_VERIFY_USES_LIBRARIES)),true,false) +else + # Let the environment variable override PRODUCT_BROKEN_VERIFY_USES_LIBRARIES. +endif +.KATI_READONLY := RELAX_USES_LIBRARY_CHECK + # The default filter for which files go into the system_other image (if it is # being used). Note that each pattern p here matches both '/<p>' and /system/<p>'. # To bundle everything one should set this to '%'. diff --git a/core/product.mk b/core/product.mk index 175c62a02e..913aec802e 100644 --- a/core/product.mk +++ b/core/product.mk @@ -236,6 +236,9 @@ _product_single_value_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_J # This is necessary to avoid jars reordering due to makefile inheritance order. _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS_EXTRA +# Set to true to disable <uses-library> checks for a product. +_product_list_vars += PRODUCT_BROKEN_VERIFY_USES_LIBRARIES + # All of the apps that we force preopt, this overrides WITH_DEXPREOPT. _product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK _product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS |