Fix mainline_mixed build

build_mixed script can't merge system and product VINTF
data yet.

Fixes: 131418170
Bug: 131425279
Test: build 'target_files_package' for 'mainline_system_google_arm64',
see META/system_manifest.xml

Change-Id: I366d9bc802ee0e6bdf8fe480303f3fee827c579d

parent 4ec15d2c

core/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -2916,6 +2916,10 @@ else ifdef BUILDING_PRODUCT_IMAGE
		check_framework_manifest := true
		endif

		# TODO (b/131425279): delete this line once build_mixed script can correctly merge system and
		# product manifests.
		check_framework_manifest := true

		ifeq ($(check_framework_manifest),true)

		BUILT_ASSEMBLED_FRAMEWORK_MANIFEST := $(PRODUCT_OUT)/verified_assembled_framework_manifest.xml