| commit | a363f249e95ffecffe3b81a54d448bfe84683642 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Wed Dec 06 14:09:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 06 14:09:31 2017 +0000 |
| tree | f1deae401537e8ae634605e61897e53b1ad8b3c9 | |
| parent | d148a93adca1272005fa2159ae531efad17f4128 [diff] | |
| parent | 2ea4ed591116f9173ebeb2d1eefdcc9c8823f18b [diff] |
Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: 2ea4ed5911 Change-Id: I0fd225966b98a212b8c9712a4942cfe3e8bd9dc2
diff --git a/core/config.mk b/core/config.mk index 567e06d..daaa54e 100644 --- a/core/config.mk +++ b/core/config.mk
@@ -697,11 +697,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 :=