Skip to content

Commit

Permalink
Update manifest merger to use binary
Browse files Browse the repository at this point in the history
Manifest merger is now a java_binary instead of a collection of jars,
it can use the single binary as the dependency.

Bug: 112607039
Test: m checkbuild
Change-Id: Id97b01542314cb165ebf7c90409a09482d8c53bc
  • Loading branch information
colincross committed Feb 27, 2019
1 parent 55ebd61 commit 7293c1e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/android_manifest.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@)
Expand Down

0 comments on commit 7293c1e

Please sign in to comment.