Commit 4dc737d3 authored May 06, 2015 by Dan Albert Committed by Android Git Automerger May 06, 2015

am 77719372: am 6ce55427: am 48240423: Merge "Fix JDK check for USE_MINGW=1."

* commit '77719372':
  Fix JDK check for USE_MINGW=1.

core/main.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ endif
		#
		# For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS.
		requires_openjdk := false
		ifeq ($(HOST_OS), linux)
		ifeq ($(BUILD_OS),linux)
		requires_openjdk := true
		endif