Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds" (c1fa1469) · Commits · e / os / android_build

core/config.mk

+17 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,23 @@ endif

		BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS))

		# ---------------------------------------------------------------
		# Whether we can expect a full build graph
		ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))
		ifneq ($(TARGET_BUILD_APPS),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifeq ($(TARGET_BUILD_PDK),true)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifneq ($(ONE_SHOT_MAKEFILE),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES

		#
		# Tools that are prebuilts for TARGET_BUILD_APPS
		#

+0 −17

Original line number	Diff line number	Diff line
		@@ -78,23 +78,6 @@ $(foreach v,$(ENABLED_VERSIONS), \
		# buildspec.mk.default and envsetup.sh.
		CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 13

		# ---------------------------------------------------------------
		# Whether we can expect a full build graph
		ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))
		ifneq ($(TARGET_BUILD_APPS),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifeq ($(TARGET_BUILD_PDK),true)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		ifneq ($(ONE_SHOT_MAKEFILE),)
		ALLOW_MISSING_DEPENDENCIES := true
		endif
		.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES

		# ---------------------------------------------------------------
		# The product defaults to generic on hardware
		# NOTE: This will be overridden in product_config.mk if make