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
diff --git a/core/config.mk b/core/config.mk
index eab8553..f74f5b4 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -675,14 +675,7 @@
JACOCO_CLI_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli$(COMMON_JAVA_PACKAGE_SUFFIX)
# Tool to merge AndroidManifest.xmls
-ANDROID_MANIFEST_MERGER_CLASSPATH := \
- prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar \
- prebuilts/gradle-plugin/com/android/tools/sdk-common/25.3.1/sdk-common-25.3.1.jar \
- prebuilts/gradle-plugin/com/android/tools/common/25.3.1/common-25.3.1.jar \
- prebuilts/misc/common/guava/guava-18.0.jar
-ANDROID_MANIFEST_MERGER := $(JAVA) \
- -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \
- com.android.manifmerger.Merger
+ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge
COLUMN:= column