jdk/make/launcher/LauncherCommon.gmk

*** 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
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, 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
*** 24,35 ****
--- 24,39 ----
  #
  
  include NativeCompilation.gmk
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
+   DISABLE_MAPFILES := true
    ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
  else
+   ifeq ($(OPENJDK_TARGET_OS), windows)
+     DISABLE_MAPFILES := true
+   endif
    ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
  
    # Applications expect to be able to link against libjawt without invoking
    # System.loadLibrary("jawt") first. This was the behaviour described in the
    # devloper documentation of JAWT and what worked with OpenJDK6.