diff options
| author | Colin Cross <ccross@android.com> | 2018-06-07 15:49:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-07 15:49:11 -0700 |
| commit | 7a72575d6d26647145c0e6c31a821f6f57c53078 (patch) | |
| tree | e9afa33dfa3a81b6a4a212da80c2ba9165dcc2dd /java/config | |
| parent | 331efc81cacc7ff56553fd60ff543262642ae51b (diff) | |
| parent | 216c4c8a7a79c47af3b3c21fbfdb92f208d0e9aa (diff) | |
| download | build_soong-7a72575d6d26647145c0e6c31a821f6f57c53078.tar.gz build_soong-7a72575d6d26647145c0e6c31a821f6f57c53078.tar.bz2 build_soong-7a72575d6d26647145c0e6c31a821f6f57c53078.zip | |
Merge "Revert "Revert "Remove desugar support""" am: 38462a6881
am: 216c4c8a7a
Change-Id: I4f148400379525f68e9f116ddcdb4b4ee36910a1
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 13 | ||||
| -rw-r--r-- | java/config/makevars.go | 11 |
2 files changed, 2 insertions, 22 deletions
diff --git a/java/config/config.go b/java/config/config.go index ec1effa5..7842da6e 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -95,18 +95,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") @@ -120,7 +108,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") diff --git a/java/config/makevars.go b/java/config/makevars.go index 27c7daaa..4dffa024 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -46,15 +46,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("JAVADOC", "${JavadocCmd}") ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}") - if ctx.Config().UseD8Desugar() { - ctx.Strict("DX", "${D8Cmd}") - ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M") - ctx.Strict("USE_D8_DESUGAR", "true") - } else { - ctx.Strict("DX", "${DxCmd}") - ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M") - ctx.Strict("USE_D8_DESUGAR", "false") - } + ctx.Strict("DX", "${D8Cmd}") + ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M") ctx.Strict("R8_COMPAT_PROGUARD", "${R8Cmd}") ctx.Strict("TURBINE", "${TurbineJar}") |