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

Merge changes If15abf79,Iaae177ef am: ff3f43857f

Browse Source 
am: 45cc967424

Change-Id: I4b322e79f5177131cd35ae7b943a008fa26c95e2
This commit is contained in:
Colin Cross
2019-05-28 09:58:26 -07:00
committed by android-build-merger
parent dfa19644fe 45cc967424
commit 67999a12d5
9 changed files with 601 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/config/config.go
View File

@@ -143,7 +143,8 @@ func init() {
hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2")
pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py")
pctx.HostBinToolVariable("ManifestCheckCmd", "manifest_check")
pctx.HostBinToolVariable("ManifestFixerCmd", "manifest_fixer")
pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")

1
java/config/makevars.go
View File

@@ -73,6 +73,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}")
ctx.Strict("MANIFEST_CHECK", "${ManifestCheckCmd}")
ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}")
ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}")