Merge "Add PRODUCT_BROKEN_VERIFY_USES_LIBRARIES." am: c79c96ae43 (e4622cff) · Commits · e / os / android_build

core/config.mk

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -479,17 +479,6 @@ USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
	USE_D8 := true		USE_D8 := true
	.KATI_READONLY := USE_D8		.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		# Tools that are prebuilts for TARGET_BUILD_USE_PREBUILT_SDKS
	#		#

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,22 @@ endif
	# The default value for LOCAL_DEX_PREOPT		# The default value for LOCAL_DEX_PREOPT
	DEX_PREOPT_DEFAULT ?= $(ENABLE_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		# 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>'.		# being used). Note that each pattern p here matches both '/<p>' and /system/<p>'.
	# To bundle everything one should set this to '%'.		# To bundle everything one should set this to '%'.

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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.		# This is necessary to avoid jars reordering due to makefile inheritance order.
	_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS_EXTRA		_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.		# All of the apps that we force preopt, this overrides WITH_DEXPREOPT.
	_product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK		_product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK
	_product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS		_product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS