8235728: JDK-8212780 breaks builds with a custom X11 include path

Reviewed-by: prr, herrick
This commit is contained in:
Alexey Semenyuk 2019-12-11 16:16:39 -05:00
parent 5799108494
commit c7b9c64eed

View File

@ -34,7 +34,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB_APPLAUNCHER, \
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libapplauncher, \
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
OPTIMIZATION := LOW, \
CFLAGS := $(CXXFLAGS_JDKLIB), \
CFLAGS := $(CXXFLAGS_JDKLIB) $(X_CFLAGS), \
CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN), \