| commit | 2d96cd1a593fd9628a36f40d3ce4ebba459a9a28 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jan 03 00:29:43 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 03 00:29:43 2018 +0000 |
| tree | 5b4098762d3ae5d00984b4e20dc27ee244eb71b6 | |
| parent | b601efd8b9b4e321b143c8634a7acc1b2196b259 [diff] | |
| parent | 1f8c5724c0b76a04a0dbb4329a231ec344e210cd [diff] |
Merge "Revert "Build with OpenJDK 9 -target 1.8 by default (attempt 3).""
diff --git a/core/config.mk b/core/config.mk index 716de64..5411d08 100644 --- a/core/config.mk +++ b/core/config.mk
@@ -708,11 +708,7 @@ COLUMN:= column ifeq ($(EXPERIMENTAL_USE_OPENJDK9),) -ifeq ($(RUN_ERROR_PRONE),true) USE_OPENJDK9 := -else -USE_OPENJDK9 := true -endif TARGET_OPENJDK9 := else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false) USE_OPENJDK9 :=