diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-16 10:23:03 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-22 10:53:59 +0100 |
| commit | 46e00ea4ba3cddfd9792b501d30d95d93828dd66 (patch) | |
| tree | e3d907fdf67c4a123440c49f96ad131c5e5793b9 /core/config.mk | |
| parent | c131ec09d9ffb92473c4162c92c0646d6e731b0c (diff) | |
| download | build-46e00ea4ba3cddfd9792b501d30d95d93828dd66.zip build-46e00ea4ba3cddfd9792b501d30d95d93828dd66.tar.gz build-46e00ea4ba3cddfd9792b501d30d95d93828dd66.tar.bz2 | |
Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
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 d0743f4..c030d22 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)),) |