commit e34ff5ca5d1d5d9f138b2a3e59962d2b65b97c09
author Colin Cross <ccross@android.com> Mon Mar 04 22:02:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 04 22:02:09 2019 +0000
tree 5e22ff9373251bff4ad3d6d8bf26a19e9d5e124e
parent 53cfd9275b40a76b1752af0a355eccbdd4a82ede
parent 7293c1e4b9675c9a3fa804dc34436ef628567b6d

Merge "Update manifest merger to use binary"

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index efa6ae6..931b1b1 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -36,7 +36,7 @@
   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 $@)