diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-24 20:18:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 20:18:15 +0000 |
| commit | f7ce9508dec85c67d3a2ebe84db073a01355eba5 (patch) | |
| tree | 9a721cfe47b047c3dfe87196afcf2f773f5abd3a /core/config.mk | |
| parent | 54fd82d111113c7969052cd315cc71bd31b4e161 (diff) | |
| parent | 4dfda1fa4201e41022396b77054168ffc73b590c (diff) | |
| download | build-f7ce9508dec85c67d3a2ebe84db073a01355eba5.zip build-f7ce9508dec85c67d3a2ebe84db073a01355eba5.tar.gz build-f7ce9508dec85c67d3a2ebe84db073a01355eba5.tar.bz2 | |
am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
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 3ceb392..91de57c 100644 --- a/core/config.mk +++ b/core/config.mk @@ -437,17 +437,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)),) |