jdk/make/lib/Lib-java.management.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 28,78 ****
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.management.gmk))
  
  ################################################################################
  
! BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \
      $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement
! BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
!     $(addprefix -I,$(BUILD_LIBMANAGEMENT_SRC)) \
      -I$(SUPPORT_OUTPUTDIR)/headers/java.management \
      $(LIBJAVA_HEADER_FLAGS) \
      #
  
- BUILD_LIBMANAGEMENT_EXCLUDES :=
- 
- ifneq ($(OPENJDK_TARGET_OS), solaris)
-   BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
- endif
- 
- ifneq ($(OPENJDK_TARGET_OS), linux)
-   BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
- endif
- 
- ifneq ($(OPENJDK_TARGET_OS), macosx)
-   BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
- endif
- 
  LIBMANAGEMENT_OPTIMIZATION := HIGH
  ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
      LIBMANAGEMENT_OPTIMIZATION := LOW
    endif
  endif
  
- # Make it possible to override this variable
- LIBMANAGEMENT_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers
- 
  $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
      LIBRARY := management, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
!     SRC := $(BUILD_LIBMANAGEMENT_SRC), \
!     EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
      LANG := C, \
      OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
!     CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \
!     MAPFILE := $(LIBMANAGEMENT_MAPFILE), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_solaris := -lkstat, \
      LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
      LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
--- 28,60 ----
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.management.gmk))
  
  ################################################################################
  
! LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \
      $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement
! LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
!     $(addprefix -I,$(LIBMANAGEMENT_SRC)) \
      -I$(SUPPORT_OUTPUTDIR)/headers/java.management \
      $(LIBJAVA_HEADER_FLAGS) \
      #
  
  LIBMANAGEMENT_OPTIMIZATION := HIGH
  ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
      LIBMANAGEMENT_OPTIMIZATION := LOW
    endif
  endif
  
  $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
      LIBRARY := management, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
!     SRC := $(LIBMANAGEMENT_SRC), \
      LANG := C, \
      OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
!     CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(LIBMANAGEMENT_CFLAGS), \
!     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_solaris := -lkstat, \
      LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
      LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \