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

* commit '4824042356e780153153ac7aafa6ce6e1b8df7f2':
  Fix JDK check for USE_MINGW=1.
This commit is contained in:
Dan Albert 2015-05-05 18:55:22 +00:00 committed by Android Git Automerger
commit 6ce55427db

View file

@ -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