| commit | 484a6e53c14907c6cc617d21d09da53f3991ecc2 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Apr 26 20:56:25 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Apr 26 20:56:25 2019 +0000 |
| tree | cf2749642486b0e2fdec3632c1c25254b2a38f4f | |
| parent | 4ec15d2c500b83323785548b862482bb41fd9a7a [diff] | |
| parent | 7e6397c2d5ddcd031a9b97258de27476af631252 [diff] |
Merge "Fix mainline_mixed build"
diff --git a/core/Makefile b/core/Makefile index 0210951..311fb22 100644 --- a/core/Makefile +++ b/core/Makefile
@@ -2916,6 +2916,10 @@ 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