Update manifest merger to use binary
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: Iea6c97c99a3bb09952fed2b25437b644f4e863f8
diff --git a/java/config/config.go b/java/config/config.go
index e607b1d..2762a4d 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -44,16 +44,6 @@
"core-oj",
"core-libart",
}
-
- ManifestMergerClasspath = []string{
- "prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.1.0/manifest-merger-26.1.0.jar",
- "prebuilts/gradle-plugin/com/android/tools/common/26.1.0/common-26.1.0.jar",
- "prebuilts/gradle-plugin/com/android/tools/sdk-common/26.1.0/sdk-common-26.1.0.jar",
- "prebuilts/gradle-plugin/com/android/tools/sdklib/26.1.0/sdklib-26.1.0.jar",
- "prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-runtime/1.0.5/kotlin-runtime-1.0.5.jar",
- "prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-stdlib/1.1.3/kotlin-stdlib-1.1.3.jar",
- "prebuilts/misc/common/guava/guava-21.0.jar",
- }
)
func init() {
@@ -152,8 +142,7 @@
pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py")
- pctx.SourcePathsVariable("ManifestMergerJars", " ", ManifestMergerClasspath...)
- pctx.SourcePathsVariable("ManifestMergerClasspath", ":", ManifestMergerClasspath...)
+ pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
pctx.HostBinToolVariable("ZipAlign", "zipalign")