Revert "Upgrade to ManifestMerger2"
This reverts commit a636f16b3422492b0941cafda7443e6c9443d0bb.
Bug: 36005379
Change-Id: If5516b34c103016529de4d591038e9e34260a8e8
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