From 46e00ea4ba3cddfd9792b501d30d95d93828dd66 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 16 Oct 2014 10:23:03 +0100
Subject: Remove Java 6 build support

Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
---
 core/config.mk | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'core/config.mk')

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)),)
-- 
cgit v1.1