Revert "Upgrade to ManifestMerger2"
This reverts commit a636f16b3422492b0941cafda7443e6c9443d0bb.
Bug: 36005379
Change-Id: If5516b34c103016529de4d591038e9e34260a8e8
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 7d573d3..0093e02 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -34,12 +34,10 @@
main_android_manifest := $(full_android_manifest)
full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml
$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
-$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)
$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps)
@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"
@mkdir -p $(dir $@)
- $(hide) $(ANDROID_MANIFEST_MERGER) --main $< \
- --libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \
+ $(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \
--out $@
endif