Make D8 Desugaring default.
Bug: 69329508
Test: m checkbuild
Change-Id: I25218efd33885a0b8c11858ccabeb4cfce4302bf
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 230b266..1f36cb4 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -615,7 +615,7 @@
endif
.PHONY: $$(rule_name)
-$$(rule_name): $$(dependencies) dx d8-compat-dx
+$$(rule_name): $$(dependencies) dx d8-compat-dx desugar
$(hide) $$(call ART_TEST_PREREQ_FINISHED,$$@)
# Clear locally defined variables.
diff --git a/build/art.go b/build/art.go
index 58df11c..bf6eee6 100644
--- a/build/art.go
+++ b/build/art.go
@@ -103,7 +103,7 @@
asflags = append(asflags, "-DART_MIPS32_CHECK_ALIGNMENT")
}
- if envTrue(ctx, "USE_D8_DESUGAR") {
+ if envTrueOrDefault(ctx, "USE_D8_DESUGAR") {
cflags = append(cflags, "-DUSE_D8_DESUGAR=1")
}
@@ -370,3 +370,7 @@
func envFalse(ctx android.BaseContext, key string) bool {
return ctx.AConfig().Getenv(key) == "false"
}
+
+func envTrueOrDefault(ctx android.BaseContext, key string) bool {
+ return ctx.AConfig().Getenv(key) != "false"
+}
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index fe4a327..2cada76 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -22,7 +22,8 @@
$(HOST_OUT_EXECUTABLES)/dx \
$(HOST_OUT_EXECUTABLES)/jasmin \
$(HOST_OUT_EXECUTABLES)/smali \
- $(HOST_OUT_EXECUTABLES)/dexmerger
+ $(HOST_OUT_EXECUTABLES)/dexmerger \
+ $(HOST_OUT_JAVA_LIBRARIES)/desugar.jar
# Add d8 dependency, if enabled.
ifeq ($(USE_D8),true)