diff options
| author | Colin Cross <ccross@android.com> | 2018-06-06 21:46:32 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-06-06 21:46:32 +0000 |
| commit | bafb897de74f85cbea6b3749b23491d0c0863580 (patch) | |
| tree | fb97c37f3ae2c74b386b06c35bba16f865e40208 /java/config/config.go | |
| parent | 7576916efcc5e73d3b5e6437187697a451dd43f0 (diff) | |
| download | build_soong-bafb897de74f85cbea6b3749b23491d0c0863580.tar.gz build_soong-bafb897de74f85cbea6b3749b23491d0c0863580.tar.bz2 build_soong-bafb897de74f85cbea6b3749b23491d0c0863580.zip | |
Revert "Revert "Remove desugar support""
This reverts commit 7576916efcc5e73d3b5e6437187697a451dd43f0.
Reason for revert: includes art veridex fix this time
Change-Id: Ia8da00b5ec8ed3dc3ce2a2521f0a7b2b2b131960
Diffstat (limited to 'java/config/config.go')
| -rw-r--r-- | java/config/config.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/java/config/config.go b/java/config/config.go index fe57c50d..c6555f19 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -93,18 +93,6 @@ func init() { pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip") pctx.HostBinToolVariable("ZipSyncCmd", "zipsync") pctx.HostBinToolVariable("ApiCheckCmd", "apicheck") - pctx.VariableFunc("DxCmd", func(ctx android.PackageVarContext) string { - config := ctx.Config() - if config.IsEnvFalse("USE_D8") { - if config.UnbundledBuild() || config.IsPdkBuild() { - return "prebuilts/build-tools/common/bin/dx" - } else { - return pctx.HostBinToolPath(ctx, "dx").String() - } - } else { - return pctx.HostBinToolPath(ctx, "d8-compat-dx").String() - } - }) pctx.HostBinToolVariable("D8Cmd", "d8") pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard") @@ -118,7 +106,6 @@ func init() { }) pctx.HostJavaToolVariable("JarjarCmd", "jarjar.jar") - pctx.HostJavaToolVariable("DesugarJar", "desugar.jar") pctx.HostJavaToolVariable("JsilverJar", "jsilver.jar") pctx.HostJavaToolVariable("DoclavaJar", "doclava.jar") pctx.HostJavaToolVariable("MetalavaJar", "metalava.jar") |