Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8149647: Incremental enhancements from build-infra
authorihse
Fri, 12 Feb 2016 11:07:54 +0100
changeset 35781 88c56fe09cb8
parent 35780 942860689ce2
child 35782 cce69c0777dc
8149647: Incremental enhancements from build-infra Reviewed-by: erikj
jdk/make/gensrc/Gensrc-jdk.jdi.gmk file | annotate | diff | comparison | revisions
jdk/make/launcher/LauncherCommon.gmk file | annotate | diff | comparison | revisions
jdk/make/lib/LibCommon.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/gensrc/Gensrc-jdk.jdi.gmk	Thu Feb 11 16:24:55 2016 -0800
+++ b/jdk/make/gensrc/Gensrc-jdk.jdi.gmk	Fri Feb 12 11:07:54 2016 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -78,11 +78,9 @@
 	$(install-file)
 
 # Some platforms don't have the serviceability agent
-ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
-  ifneq ($(JVM_VARIANT_ZERO), true)
-    GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
-        $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
-  endif
+ifeq ($(INCLUDE_SA), true)
+  GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
+      $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
 endif
 
 ################################################################################
--- a/jdk/make/launcher/LauncherCommon.gmk	Thu Feb 11 16:24:55 2016 -0800
+++ b/jdk/make/launcher/LauncherCommon.gmk	Fri Feb 12 11:07:54 2016 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -26,8 +26,12 @@
 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
--- a/jdk/make/lib/LibCommon.gmk	Thu Feb 11 16:24:55 2016 -0800
+++ b/jdk/make/lib/LibCommon.gmk	Fri Feb 12 11:07:54 2016 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -36,6 +36,10 @@
 # elegant solution to this.
 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 
+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
+  DISABLE_MAPFILES := true
+endif
+
 ################################################################################
 # Find the default set of src dirs for a native library.
 # Param 1 - module name
jdk-sandbox