Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f17f1f6e authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Fix mainline_mixed build" am: 484a6e53 

am: f97b1715

Change-Id: I6bc6b76d21e49a5ade540b8130530d87e1eb7fc2
parents c3b9f66c f97b1715

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -2917,6 +2917,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