Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1b840c authored Oct 07, 2024 by Treehugger Robot Committed by Automerger Merge Worker Oct 07, 2024

Merge "Adding EXTRA_ALLOWED_DEPS_TXT config for non-mainline deps" into main am: ec0fccfb

Original change: https://android-review.googlesource.com/c/platform/build/+/3296754

Change-Id: Ie0ddc575f3e441ac230b298726d31b241b53d31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a2c1d0d2 ec0fccfb

core/project_definitions.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,6 @@
		# Include definitions for prebuilt SDK, if present.
		#
		-include prebuilts/sdk/current/definitions.mk

		# SDV-specific config.
		-include system/software_defined_vehicle/platform/config.mk

core/soong_config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -348,6 +348,8 @@ $(call add_json_list, SystemExtPropFiles, $(TARGET_SYSTEM_EXT_PROP))
		$(call add_json_list, ProductPropFiles, $(TARGET_PRODUCT_PROP))
		$(call add_json_list, OdmPropFiles, $(TARGET_ODM_PROP))

		$(call add_json_str, ExtraAllowedDepsTxt, $(EXTRA_ALLOWED_DEPS_TXT))

		# Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,
		# to have the same behavior from runtime_libart.mk.
		ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)