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

Commit e34ff5ca authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Update manifest merger to use binary"

parents 53cfd927 7293c1e4

core/android_manifest.mk

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ ifneq (,$(strip $(my_full_libs_manifest_files))) 
  fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed



  $(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)

  $(full_android_manifest): $(ANDROID_MANIFEST_MERGER_DEPS)

  $(full_android_manifest): $(ANDROID_MANIFEST_MERGER)

  $(full_android_manifest) : $(fixed_android_manifest) $(my_full_libs_manifest_files)

	@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"

	@mkdir -p $(dir $@)