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
This commit is contained in:
@@ -21,7 +21,6 @@ import (
|
||||
"github.com/google/blueprint"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/java/config"
|
||||
)
|
||||
|
||||
var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer",
|
||||
@@ -37,9 +36,8 @@ var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer",
|
||||
|
||||
var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger",
|
||||
blueprint.RuleParams{
|
||||
Command: `${config.JavaCmd} -classpath ${config.ManifestMergerClasspath} com.android.manifmerger.Merger ` +
|
||||
`--main $in $libs --out $out`,
|
||||
CommandDeps: config.ManifestMergerClasspath,
|
||||
Command: `${config.ManifestMergerCmd} --main $in $libs --out $out`,
|
||||
CommandDeps: []string{"${config.ManifestMergerCmd}"},
|
||||
},
|
||||
"libs")
|
||||
|
||||
|
Reference in New Issue
Block a user