Merge "Use R8 wrapper target and flags." am: 750986db96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127902 Change-Id: Ib962e5fee76f63dffd72c31105ac2466209ee4a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -159,7 +159,7 @@ func init() {
|
||||
pctx.HostBinToolVariable("ZipSyncCmd", "zipsync")
|
||||
pctx.HostBinToolVariable("ApiCheckCmd", "apicheck")
|
||||
pctx.HostBinToolVariable("D8Cmd", "d8")
|
||||
pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard")
|
||||
pctx.HostBinToolVariable("R8Cmd", "r8")
|
||||
pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")
|
||||
pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")
|
||||
pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {
|
||||
@@ -177,7 +177,7 @@ func init() {
|
||||
pctx.HostJavaToolVariable("MetalavaJar", "metalava.jar")
|
||||
pctx.HostJavaToolVariable("DokkaJar", "dokka.jar")
|
||||
pctx.HostJavaToolVariable("JetifierJar", "jetifier.jar")
|
||||
pctx.HostJavaToolVariable("R8Jar", "r8-compat-proguard.jar")
|
||||
pctx.HostJavaToolVariable("R8Jar", "r8.jar")
|
||||
pctx.HostJavaToolVariable("D8Jar", "d8.jar")
|
||||
|
||||
pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")
|
||||
|
Reference in New Issue
Block a user