diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-23 09:00:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-23 09:00:15 +0000 |
| commit | 4dfda1fa4201e41022396b77054168ffc73b590c (patch) | |
| tree | 6cf38e241b44613a8d2000e2f1b3b27e1a11748e /core/config.mk | |
| parent | 660f3c9ae9cb99f428fb62fb6a1256679eb9f138 (diff) | |
| parent | 46e00ea4ba3cddfd9792b501d30d95d93828dd66 (diff) | |
| download | build-4dfda1fa4201e41022396b77054168ffc73b590c.zip build-4dfda1fa4201e41022396b77054168ffc73b590c.tar.gz build-4dfda1fa4201e41022396b77054168ffc73b590c.tar.bz2 | |
Merge "Remove Java 6 build support"
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/config.mk b/core/config.mk index 4d4fa4f..6a16694 100644 --- a/core/config.mk +++ b/core/config.mk @@ -418,17 +418,7 @@ else COLUMN:= column endif -ifeq ($(HOST_OS),darwin) -ifeq ($(LEGACY_USE_JAVA6),) -HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) -else -# Deliberately set to blank for Java 6 installations on MacOS. These -# versions allegedly use a non-standard directory structure. -HOST_JDK_TOOLS_JAR := -endif -else HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) -endif ifneq ($(HOST_JDK_TOOLS_JAR),) ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),) |