StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update manifest merger to use binary am: 87ecbfe107

Browse Source 
am: d8f3e6f5d4

Change-Id: I258a8d1cdc2da373dd644a9b29b80d6bfdc377c6
This commit is contained in:
Colin Cross
2019-03-04 14:20:47 -08:00
committed by android-build-merger
parent 29560640a9 d8f3e6f5d4
commit 867b1daec4
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/android_manifest.go
View File

@@ -21,7 +21,6 @@ import (
"github.com/google/blueprint" "github.com/google/blueprint"
"android/soong/android" "android/soong/android"
"android/soong/java/config"
) )
var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer", var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer",
@@ -37,9 +36,8 @@ var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer",
var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger", var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${config.JavaCmd} -classpath ${config.ManifestMergerClasspath} com.android.manifmerger.Merger ` + Command: `${config.ManifestMergerCmd} --main $in $libs --out $out`,
`--main $in $libs --out $out`, CommandDeps: []string{"${config.ManifestMergerCmd}"},
CommandDeps: config.ManifestMergerClasspath,
}, },
"libs") "libs")

13
java/config/config.go
View File

@@ -44,16 +44,6 @@ var (
"core-oj", "core-oj",
"core-libart", "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() { func init() {
@@ -152,8 +142,7 @@ func init() {
pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py") pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py")
pctx.SourcePathsVariable("ManifestMergerJars", " ", ManifestMergerClasspath...) pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
pctx.SourcePathsVariable("ManifestMergerClasspath", ":", ManifestMergerClasspath...)
pctx.HostBinToolVariable("ZipAlign", "zipalign") pctx.HostBinToolVariable("ZipAlign", "zipalign")

4
java/config/makevars.go
View File

@@ -75,9 +75,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}") ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}")
ctx.Strict("ANDROID_MANIFEST_MERGER_DEPS", "${ManifestMergerJars}") ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}")
ctx.Strict("ANDROID_MANIFEST_MERGER",
"${JavaCmd} -classpath ${ManifestMergerClasspath} com.android.manifmerger.Merger")
ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}") ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}")
ctx.Strict("HIDDENAPI", "${HiddenAPI}") ctx.Strict("HIDDENAPI", "${HiddenAPI}")