StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mainline_mixed build"

Browse Source 
am: 484a6e53c1

Change-Id: Ie705c3c24ee2a02534605eed5624a2cb826ef1ea
This commit is contained in:
Yifan Hong
2019-04-26 14:12:35 -07:00
committed by android-build-merger
parent 229ba6c8ee 484a6e53c1
commit f97b171594
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -2916,6 +2916,10 @@ else ifdef BUILDING_PRODUCT_IMAGE
check_framework_manifest := true check_framework_manifest := true
endif 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) ifeq ($(check_framework_manifest),true)
BUILT_ASSEMBLED_FRAMEWORK_MANIFEST := $(PRODUCT_OUT)/verified_assembled_framework_manifest.xml BUILT_ASSEMBLED_FRAMEWORK_MANIFEST := $(PRODUCT_OUT)/verified_assembled_framework_manifest.xml