Merge "Fix mainline_mixed build"

am: 484a6e53c1 Change-Id: Ie705c3c24ee2a02534605eed5624a2cb826ef1ea
2019-04-26 14:12:35 -07:00
parent 229ba6c8ee 484a6e53c1
commit f97b171594
1 changed files with 4 additions and 0 deletions
--- a/core/Makefile
+++ b/core/Makefile
@@ -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