Merge "Fix mainline_mixed build"

2019-04-26 20:56:25 +00:00
parent 4ec15d2c50 7e6397c2d5
commit 484a6e53c1
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