| 1 | --- ./jdk/make/lib/Awt2dLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 2 | +++ ../Awt2dLibraries.gmk 2017-04-02 18:36:12.582240305 +0530 |
| 3 | @@ -145,7 +145,7 @@ |
| 4 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility |
| 5 | endif |
| 6 | |
| 7 | -ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
| 8 | +ifneq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), ) |
| 9 | LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
| 10 | endif |
| 11 | |
| 12 | @@ -212,7 +212,7 @@ |
| 13 | LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc |
| 14 | endif |
| 15 | |
| 16 | -ifeq ($(OPENJDK_TARGET_OS), android) |
| 17 | +ifeq ($(OPENJDK_TARGET_OS), linux) |
| 18 | LIBAWT_EXFILES += \ |
| 19 | java2d/loops/TransformHelper.c \ |
| 20 | java2d/loops/ScaledBlit.c \ |
| 21 | @@ -347,10 +347,10 @@ |
| 22 | endif |
| 23 | endif |
| 24 | |
| 25 | - LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc |
| 26 | + LIBAWT_XAWT_LIBS := $(LIBM) $(LIBDL) -ljava -ljvm -lc |
| 27 | |
| 28 | ifeq ($(OPENJDK_TARGET_OS), linux) |
| 29 | - LIBAWT_XAWT_LIBS += -lpthread |
| 30 | + LIBAWT_XAWT_LIBS += -lc |
| 31 | endif |
| 32 | |
| 33 | ifeq ($(TOOLCHAIN_TYPE), gcc) |
| 34 | @@ -669,7 +669,7 @@ |
| 35 | X11TextRenderer.c \ |
| 36 | fontpath.c \ |
| 37 | lcdglyph.c |
| 38 | -else ifeq ($(OPENJDK_TARGET_OS), android) |
| 39 | +else ifeq ($(OPENJDK_TARGET_OS), linux) |
| 40 | LIBFONTMANAGER_EXCLUDE_FILES += X11TextRenderer.c |
| 41 | else |
| 42 | LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ |
| 43 | @@ -939,7 +939,7 @@ |
| 44 | LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll |
| 45 | LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
| 46 | else |
| 47 | - LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
| 48 | + LIBSPLASHSCREEN_LIBS += $(LIBM) -lc -ldl |
| 49 | endif |
| 50 | |
| 51 | $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \ |
| 52 | --- ./jdk/make/lib/Lib-java.desktop.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 53 | +++ ../Lib-java.desktop.gmk 2017-04-02 19:01:58.000696690 +0530 |
| 54 | @@ -31,7 +31,7 @@ |
| 55 | |
| 56 | include LibosxLibraries.gmk |
| 57 | include PlatformLibraries.gmk |
| 58 | -ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios)) |
| 59 | +ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios linux)) |
| 60 | include Awt2dLibraries.gmk |
| 61 | endif |
| 62 | include SoundLibraries.gmk |
| 63 | --- ./jdk/make/lib/SoundLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 64 | +++ ../SoundLibraries.gmk 2017-04-02 19:14:25.382032835 +0530 |
| 65 | @@ -69,16 +69,11 @@ |
| 66 | LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES) |
| 67 | endif # OPENJDK_TARGET_OS windows |
| 68 | |
| 69 | -ifeq ($(OPENJDK_TARGET_OS), linux) |
| 70 | - EXTRA_SOUND_JNI_LIBS += jsoundalsa |
| 71 | - LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX |
| 72 | -endif # OPENJDK_TARGET_OS linux |
| 73 | - |
| 74 | ifeq ($(OPENJDK_TARGET_OS), aix) |
| 75 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX |
| 76 | endif # OPENJDK_TARGET_OS aix |
| 77 | |
| 78 | -ifeq ($(OPENJDK_TARGET_OS), android) |
| 79 | +ifeq ($(OPENJDK_TARGET_OS), linux) |
| 80 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX |
| 81 | endif |
| 82 | |