diff options
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | build/art.go | 6 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 230b2665e6..1f36cb4e46 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -615,7 +615,7 @@ define define-test-art-gtest-combination 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 58df11ca5e..bf6eee6c41 100644 --- a/build/art.go +++ b/build/art.go @@ -103,7 +103,7 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { 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 envTrue(ctx android.BaseContext, key string) bool { 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 fe4a327a1f..2cada76d90 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -22,7 +22,8 @@ TEST_ART_RUN_TEST_DEPENDENCIES := \ $(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) |