8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure

The include directive should be conditional on the use of the system JPEG library.

Reviewed-by: prr, ihse
This commit is contained in:
Andrew John Hughes 2015-05-29 17:29:52 +01:00
parent f5800b1a9c
commit 0c39467189

View File

@ -491,7 +491,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
SRC := $(LIBJAVAJPEG_SRC), \
INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
OPTIMIZATION := HIGHEST, \
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \
CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
$(LIBJAVA_HEADER_FLAGS) \
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \