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

Merge changes from topic "soong-java-install" am: 8a709b149b am: 03a3ea3885 am: 932eda33a7 am: 3a075ff1a4 am: f9fa105279

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881031

Change-Id: I7b1a81fc24b48ef5daeec7fcd6b9d42814655013
This commit is contained in:
Treehugger Robot
2021-11-10 18:10:42 +00:00
committed by Automerger Merge Worker
parent 89ade48766 f9fa105279
commit 00d0079ecf
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/config/config.go
View File

@@ -124,8 +124,8 @@ func init() {
pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip")
pctx.HostBinToolVariable("ZipSyncCmd", "zipsync")
pctx.HostBinToolVariable("ApiCheckCmd", "apicheck")
pctx.HostJavaBinToolVariable("D8Cmd", "d8")
pctx.HostJavaBinToolVariable("R8Cmd", "r8-compat-proguard")
pctx.HostBinToolVariable("D8Cmd", "d8")
pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard")
pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")
pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")
pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {