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

Commit 484a6e53 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "Fix mainline_mixed build"

parents 4ec15d2c 7e6397c2

core/Makefile

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