OpenJDK / jigsaw / jake / jdk
changeset 14496:fa885780a428
Reverting unneeded jigsaw specific changes
line wrap: on
line diff
--- a/make/Import.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/Import.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -33,12 +33,12 @@ # Put the libraries here. Different locations for different target OS types. ifneq ($(OPENJDK_TARGET_OS), windows) HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR) - BASE_INSTALL_LIBRARIES_HERE := $(MODULES_LIBS_OUTPUTDIR)/java.base$(OPENJDK_TARGET_CPU_LIBDIR) - SA_INSTALL_LIBRARIES_HERE := $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent$(OPENJDK_TARGET_CPU_LIBDIR) + BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) + SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent$(OPENJDK_TARGET_CPU_LIBDIR) else HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/bin - BASE_INSTALL_LIBRARIES_HERE := $(MODULES_LIBS_OUTPUTDIR)/java.base - SA_INSTALL_LIBRARIES_HERE := $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent + BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base + SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent endif ################################################################################ @@ -221,36 +221,36 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_BIN, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/java.base, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \ DEST := $(JDK_OUTPUTDIR)/bin, \ FILES := $(filter-out %.lib, $(BASE_TARGETS)))) $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_LIB, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/java.base, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \ DEST := $(JDK_OUTPUTDIR)/lib, \ FILES := $(filter %.lib, $(BASE_TARGETS)))) $(eval $(call SetupCopyFiles,SA_COPY_LIBS, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent, \ DEST := $(JDK_OUTPUTDIR)/lib, \ - FILES := $(filter $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent/%, \ + FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent/%, \ $(SA_TARGETS)))) $(eval $(call SetupCopyFiles,SA_COPY_LIBS, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent, \ DEST := $(JDK_OUTPUTDIR)/bin, \ - FILES := $(filter $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent/%, \ + FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent/%, \ $(SA_TARGETS)))) else $(eval $(call SetupCopyFiles,BASE_COPY_LIBS, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/java.base, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \ DEST := $(JDK_OUTPUTDIR)/lib, \ FILES := $(BASE_TARGETS))) $(eval $(call SetupCopyFiles,SA_COPY_LIBS, \ - SRC := $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent, \ DEST := $(JDK_OUTPUTDIR)/lib, \ - FILES := $(filter $(MODULES_LIBS_OUTPUTDIR)/jdk.hotspot.agent/%, $(SA_TARGETS)))) + FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent/%, $(SA_TARGETS)))) endif ################################################################################
--- a/make/copy/CopyCommon.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/copy/CopyCommon.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -23,9 +23,9 @@ # questions. # -INCLUDE_DST_DIR := $(MODULES_INCLUDE_OUTPUTDIR)/$(MODULE) -LIB_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/$(MODULE) -CONF_DST_DIR := $(MODULES_CONF_OUTPUTDIR)/$(MODULE) +INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE) +LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE) +CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE) INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
--- a/make/gendata/Gendata-java.base.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gendata/Gendata-java.base.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -62,7 +62,7 @@ ################################################################################ GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security -GENDATA_JAVA_SECURITY := $(MODULES_CONF_OUTPUTDIR)/java.base/security/java.security +GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security # RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile @@ -76,13 +76,13 @@ ################################################################################ -$(MODULES_LIBS_OUTPUTDIR)/java.base/classlist: \ +$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist: \ $(JDK_TOPDIR)/make/data/classlist/classlist.$(OPENJDK_TARGET_OS) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(TOOL_ADDJSUM) $< $@.tmp $(MV) $@.tmp $@ -TARGETS += $(MODULES_LIBS_OUTPUTDIR)/java.base/classlist +TARGETS += $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist ################################################################################
--- a/make/gendata/GendataBlacklistedCerts.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gendata/GendataBlacklistedCerts.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -24,7 +24,7 @@ # GENDATA_BLACKLISTED_CERTS_SRC := $(JDK_TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem -GENDATA_BLACKLISTED_CERTS := $(MODULES_LIBS_OUTPUTDIR)/$(MODULE)/security/blacklisted.certs +GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs ifndef OPENJDK GENDATA_BLACKLISTED_CERTS_SRC += $(wildcard $(JDK_TOPDIR)/make/closed/data/blacklistedcertsconverter/blacklisted.certs.pem)
--- a/make/gendata/GendataFontConfig.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gendata/GendataFontConfig.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -23,7 +23,7 @@ # questions. # -GENDATA_FONT_CONFIG_DST := $(MODULES_LIBS_OUTPUTDIR)/$(MODULE) +GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE) GENDATA_FONT_CONFIG_DATA_DIR := $(JDK_TOPDIR)/make/data/fontconfig ifndef OPENJDK
--- a/make/gendata/GendataPolicyJars.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gendata/GendataPolicyJars.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -33,7 +33,7 @@ ################################################################################ US_EXPORT_POLICY_JAR_DST := \ - $(MODULES_LIBS_OUTPUTDIR)/java.base/security/US_export_policy.jar + $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/US_export_policy.jar US_EXPORT_POLICY_JAR_LIMITED := \ $(SUPPORT_OUTPUTDIR)/jce/policy/limited/US_export_policy.jar @@ -53,7 +53,7 @@ # the files. Consult README.txt (below) for more info. # UNLIMITED_POLICY_DIR := \ - $(MODULES_LIBS_OUTPUTDIR)/java.base/security/unlimited_policy + $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/unlimited_policy endif # @@ -115,7 +115,7 @@ ################################################################################ LOCAL_POLICY_JAR_DST := \ - $(MODULES_LIBS_OUTPUTDIR)/java.base/security/local_policy.jar + $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/local_policy.jar LOCAL_POLICY_JAR_LIMITED := \ $(SUPPORT_OUTPUTDIR)/jce/policy/limited/local_policy.jar
--- a/make/gendata/GendataTZDB.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gendata/GendataTZDB.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -32,7 +32,7 @@ TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE)) -GENDATA_TZDB_DAT := $(MODULES_LIBS_OUTPUTDIR)/$(MODULE)/tzdb.dat +GENDATA_TZDB_DAT := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/tzdb.dat $(GENDATA_TZDB_DAT): $(TZDATA_TZFILES) $(RM) $(GENDATA_TZDB_DAT)
--- a/make/gensrc/Gensrc-jdk.charsets.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/Gensrc-jdk.charsets.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -31,7 +31,7 @@ # CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping -CHARSET_GENSRC_JAVA_DIR_CS := $(GENSRC_OUTPUTDIR)/jdk.charsets/sun/nio/cs/ext +CHARSET_GENSRC_JAVA_DIR_CS := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping CHARSET_TEMPLATES := \
--- a/make/gensrc/Gensrc-jdk.jdi.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/Gensrc-jdk.jdi.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -30,8 +30,8 @@ # and a JDWPCommands.h C-header file. JDWP_SPEC_FILE := $(JDK_TOPDIR)/make/data/jdwp/jdwp.spec -HEADER_FILE := $(HEADERS_OUTPUTDIR)/jdk.jdwp.agent/JDWPCommands.h -JAVA_FILE := $(GENSRC_OUTPUTDIR)/jdk.jdi/com/sun/tools/jdi/JDWP.java +HEADER_FILE := $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h +JAVA_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java # Both the header and java file are created using the same recipe. By declaring # this rule and adding header file to dependencies for java file, both are @@ -41,23 +41,23 @@ # Touch the target of this rule at the end to avoid triggering false rebuilds $(JAVA_FILE): $(JDWP_SPEC_FILE) $(BUILD_TOOLS_JDK) $(HEADER_FILE) $(MKDIR) -p $(@D) - $(MKDIR) -p $(HEADERS_OUTPUTDIR)/jdk.jdwp.agent - $(RM) $@ $(HEADERS_OUTPUTDIR)/jdk.jdwp.agent/JDWPCommands.h + $(MKDIR) -p $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent + $(RM) $@ $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h $(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec $(TOOL_JDWPGEN) $< -jdi $@ -include \ - $(HEADERS_OUTPUTDIR)/jdk.jdwp.agent/JDWPCommands.h + $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h $(TOUCH) $@ -$(GENSRC_OUTPUTDIR)/jdk.jdi/jdwp-protocol.html: $(JDWP_SPEC_FILE) \ +$(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html: $(JDWP_SPEC_FILE) \ $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(RM) $@ $(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec $(TOOL_JDWPGEN) $< -doc $@ -GENSRC_JDWP := $(GENSRC_OUTPUTDIR)/jdk.jdi/com/sun/tools/jdi/JDWP.java \ - $(HEADERS_OUTPUTDIR)/jdk.jdwp.agent/JDWPCommands.h \ - $(GENSRC_OUTPUTDIR)/jdk.jdi/jdwp-protocol.html +GENSRC_JDWP := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java \ + $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html GENSRC_JDK_JDI += $(GENSRC_JDWP) ################################################################################
--- a/make/gensrc/GensrcBuffer.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcBuffer.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -25,7 +25,7 @@ GENSRC_BUFFER := -GENSRC_BUFFER_DST := $(GENSRC_OUTPUTDIR)/java.base/java/nio +GENSRC_BUFFER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
--- a/make/gensrc/GensrcCLDR.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcCLDR.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -26,8 +26,8 @@ CLDRVERSION := 27.0.0 CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION)) -GENSRC_BASEDIR := $(GENSRC_OUTPUTDIR)/java.base -GENSRC_DIR := $(GENSRC_OUTPUTDIR)/jdk.localedata +GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base +GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java
--- a/make/gensrc/GensrcCharacterData.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcCharacterData.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -24,7 +24,7 @@ # # -# Rules to create $(GENSRC_OUTPUTDIR)/java.base/sun/lang/CharacterData*.java +# Rules to create $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/lang/CharacterData*.java # GENSRC_CHARACTERDATA := @@ -33,7 +33,7 @@ UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata define SetupCharacterData - $(GENSRC_OUTPUTDIR)/java.base/java/lang/$1.java: \ + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java: \ $(CHARACTERDATA)/$1.java.template $(MKDIR) -p $$(@D) $(ECHO) $(LOG_INFO) Generating $1.java @@ -42,10 +42,10 @@ -spec $(UNICODEDATA)/UnicodeData.txt \ -specialcasing $(UNICODEDATA)/SpecialCasing.txt \ -proplist $(UNICODEDATA)/PropList.txt \ - -o $(GENSRC_OUTPUTDIR)/java.base/java/lang/$1.java -string \ + -o $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java -string \ -usecharforbyte $3 - GENSRC_CHARACTERDATA += $(GENSRC_OUTPUTDIR)/java.base/java/lang/$1.java + GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java endef $(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8)) @@ -55,12 +55,12 @@ $(eval $(call SetupCharacterData,CharacterData0E, -plane 14, 11 4 1)) # Copy two Java files that need no preprocessing. -$(GENSRC_OUTPUTDIR)/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template +$(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template $(ECHO) $(LOG_INFO) Generating $(@F) $(call install-file) -GENSRC_CHARACTERDATA += $(GENSRC_OUTPUTDIR)/java.base/java/lang/CharacterDataUndefined.java \ - $(GENSRC_OUTPUTDIR)/java.base/java/lang/CharacterDataPrivateUse.java +GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \ + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java GENSRC_JAVA_BASE += $(GENSRC_CHARACTERDATA) $(GENSRC_CHARACTERDATA): $(BUILD_TOOLS_JDK)
--- a/make/gensrc/GensrcCharsetCoder.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcCharsetCoder.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -25,7 +25,7 @@ GENSRC_CHARSETCODER := -GENSRC_CHARSETCODER_DST := $(GENSRC_OUTPUTDIR)/java.base/java/nio/charset +GENSRC_CHARSETCODER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
--- a/make/gensrc/GensrcCharsetMapping.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcCharsetMapping.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -30,7 +30,7 @@ # CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping CHARSET_EXTSRC_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext -CHARSET_GENSRC_JAVA_DIR_BASE := $(GENSRC_OUTPUTDIR)/java.base/sun/nio/cs +CHARSET_GENSRC_JAVA_DIR_BASE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/cs CHARSET_DONE_BASE := $(CHARSET_GENSRC_JAVA_DIR_BASE)/_the.charsetmapping CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping CHARSET_TEMPLATES := \
--- a/make/gensrc/GensrcExceptions.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcExceptions.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -25,7 +25,7 @@ GENSRC_EXCEPTIONS := -GENSRC_EXCEPTIONS_DST := $(GENSRC_OUTPUTDIR)/java.base/java/nio +GENSRC_EXCEPTIONS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh
--- a/make/gensrc/GensrcIcons.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcIcons.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -25,7 +25,7 @@ GENSRC_AWT_ICONS := GENSRC_AWT_ICONS_SRC := -GENSRC_AWT_ICONS_TMP := $(GENSRC_OUTPUTDIR)/java.desktop +GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/ ifdef OPENJDK @@ -111,7 +111,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) - GENSRC_OSX_ICONS_DST := $(HEADERS_OUTPUTDIR)/java.desktop + GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h ifdef OPENJDK
--- a/make/gensrc/GensrcLocaleData.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcLocaleData.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -42,17 +42,17 @@ LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES))))) # Include the list of resources found during the previous compile. --include $(GENSRC_OUTPUTDIR)/_the.locale_resources +-include $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES)) NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES)) ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES)) # There is a difference in the number of supported resources. Trigger a regeneration. - $(shell $(RM) $(GENSRC_OUTPUTDIR)/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \ - $(GENSRC_OUTPUTDIR)/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \ - $(GENSRC_OUTPUTDIR)/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java \ - $(GENSRC_OUTPUTDIR)/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java) + $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \ + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java) endif # The base locales @@ -119,24 +119,24 @@ SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_LOCALES))/g' SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g' -$(GENSRC_OUTPUTDIR)/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \ +$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \ $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ - > $(GENSRC_OUTPUTDIR)/_the.locale_resources + > $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources $(SED) $(SED_BASEARGS) $< > $@ -$(GENSRC_OUTPUTDIR)/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \ +$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \ $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ - > $(GENSRC_OUTPUTDIR)/_the.locale_resources + > $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources $(SED) $(SED_NONBASEARGS) $< > $@ -GENSRC_BASELOCALEDATA := $(GENSRC_OUTPUTDIR)/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java -GENSRC_LOCALEDATA := $(GENSRC_OUTPUTDIR)/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java +GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java +GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java GENSRC_JAVA_BASE += $(GENSRC_BASELOCALEDATA) GENSRC_JDK_LOCALEDATA += $(GENSRC_LOCALEDATA)
--- a/make/gensrc/GensrcMisc.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcMisc.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -35,7 +35,7 @@ # $(call DependOnVariable, FULL_VERSION) \ # $(call DependOnVariable, RUNTIME_VERSION) -$(GENSRC_OUTPUTDIR)/java.base/sun/misc/Version.java: \ +$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java: \ $(JDK_TOPDIR)/src/java.base/share/classes/sun/misc/Version.java.template $(MKDIR) -p $(@D) $(RM) $@ $@.tmp @@ -47,11 +47,11 @@ $< > $@.tmp $(MV) $@.tmp $@ -GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/sun/misc/Version.java +GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java ########################################################################################## -GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/sun/nio/ch/SocketOptionRegistry.java +GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java GENSRC_SOR_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/ch GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c @@ -71,7 +71,7 @@ SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template ifeq ($(wildcard $(SOR_PREGEN_FILE)), ) - $(GENSRC_OUTPUTDIR)/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE) + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \ @@ -79,7 +79,7 @@ $(BUILD_GENSRC_SOR_EXE) >> $@.tmp $(MV) $@.tmp $@ else - $(GENSRC_OUTPUTDIR)/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE) + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE) $(call install-file) endif @@ -87,7 +87,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows) - GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/sun/nio/fs/UnixConstants.java + GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java GENSRC_UC_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs GENSRC_UC_SRC_FILE := genUnixConstants.c @@ -107,7 +107,7 @@ UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template ifeq ($(wildcard $(UC_PREGEN_FILE)), ) - $(GENSRC_OUTPUTDIR)/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE) + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \ @@ -115,7 +115,7 @@ $(BUILD_GENSRC_UC_EXE) >> $@.tmp $(MV) $@.tmp $@ else - $(GENSRC_OUTPUTDIR)/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE) + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE) $(call install-file) endif @@ -125,7 +125,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) - GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/sun/nio/fs/SolarisConstants.java + GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java GENSRC_SOL_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs GENSRC_SOL_SRC_FILE := genSolarisConstants.c @@ -142,7 +142,7 @@ OUTPUT_DIR := $(GENSRC_SOL_BIN), \ PROGRAM := genSolarisConstants)) - $(GENSRC_OUTPUTDIR)/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE) + $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
--- a/make/gensrc/GensrcModuleLoaderMap.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcModuleLoaderMap.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -128,7 +128,7 @@ ############################################################################ -$(GENSRC_OUTPUTDIR)/java.base/jdk/internal/module/ModuleLoaderMap.java: \ +$(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \ $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \ $(VARDEPS_FILE) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) @@ -137,9 +137,9 @@ -ext $(EXT_MODULES_LIST) -o $@.tmp $< $(MV) $@.tmp $@ -GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/jdk/internal/module/ModuleLoaderMap.java +GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java -$(GENSRC_OUTPUTDIR)/java.base/jdk/internal/module/ModuleLoaderMap.dat: \ +$(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.dat: \ $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.dat \ $(VARDEPS_FILE) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) @@ -148,6 +148,6 @@ -ext $(EXT_MODULES_LIST) -o $@.tmp $< $(MV) $@.tmp $@ -GENSRC_JAVA_BASE += $(GENSRC_OUTPUTDIR)/java.base/jdk/internal/module/ModuleLoaderMap.dat +GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.dat ################################################################################
--- a/make/gensrc/GensrcProperties.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcProperties.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -30,7 +30,7 @@ # Helper macro for SetupCopy-zh_HK. define SetupOneCopy-zh_HK $1_$2_TARGET := $$(patsubst $(JDK_TOPDIR)/src/$(MODULE)/share/classes/%, \ - $(GENSRC_OUTPUTDIR)/$(MODULE)/%, \ + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \ $$(subst _zh_TW,_zh_HK, $2)) $$($1_$2_TARGET): $2 @@ -68,7 +68,7 @@ # Strip away prefix and suffix, leaving for example only: # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN" $1_JAVAS := $$(patsubst $$($1_MODULE_PATH_ROOT)/%, \ - $(GENSRC_OUTPUTDIR)/%, \ + $(SUPPORT_OUTPUTDIR)/gensrc/%, \ $$(patsubst %.properties, %.java, \ $$(subst /$(OPENJDK_TARGET_OS)/classes,, \ $$(subst /$(OPENJDK_TARGET_OS_TYPE)/classes,, \ @@ -86,8 +86,8 @@ $$(addsuffix _SPACE_$$($1_CLASS), \ $$(addprefix _SPACE_, $$($1_JAVAS))))) - $1_TARGET := $(GENSRC_OUTPUTDIR)/$(MODULE)/_the.$1.done - $1_CMDLINE_FILE := $(GENSRC_OUTPUTDIR)/$(MODULE)/_the.$1.cmdline + $1_TARGET := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.done + $1_CMDLINE_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.cmdline # Now setup the rule for the generation of the resource bundles. $$($1_TARGET): $$($1_SRCS) $$($1_JAVAS) $(BUILD_TOOLS_JDK)
--- a/make/gensrc/GensrcSwing.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcSwing.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -27,18 +27,18 @@ # Generate java files for javax.swing.plaf package # NIMBUS_PACKAGE = javax.swing.plaf -NIMBUS_GENSRC_DIR = $(GENSRC_OUTPUTDIR)/java.desktop/javax/swing/plaf/nimbus +NIMBUS_GENSRC_DIR = $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/javax/swing/plaf/nimbus NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf -$(GENSRC_OUTPUTDIR)/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK) +$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(@D) $(ECHO) "Generating Nimbus source files" $(TOOL_GENERATENIMBUS) $(LOG_INFO) \ - -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRC_OUTPUTDIR)/java.desktop \ + -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop \ -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus $(ECHO) $(LOG_INFO) "Finished generating Nimbus source files" $(TOUCH) $@ -GENSRC_SWING_NIMBUS := $(GENSRC_OUTPUTDIR)/java.desktop/_the.generated_nimbus +GENSRC_SWING_NIMBUS := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus GENSRC_JAVA_DESKTOP += $(GENSRC_SWING_NIMBUS)
--- a/make/gensrc/GensrcX11Wrappers.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/gensrc/GensrcX11Wrappers.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -37,9 +37,9 @@ GENSRC_X11WRAPPERS := # Put temporary c-code and executable to calculate offsets here. # Also put verification offset file here as well. -GENSRC_X11WRAPPERS_TMP := $(GENSRC_OUTPUTDIR)/java.desktop/_x11wrappers +GENSRC_X11WRAPPERS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_x11wrappers # Put the generated Java classes used to interface X11 from awt here. -GENSRC_X11WRAPPERS_DST := $(GENSRC_OUTPUTDIR)/java.desktop/sun/awt/X11 +GENSRC_X11WRAPPERS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11 # The pre-calculated offset file are stored here: GENSRC_SIZER_DIR := $(JDK_TOPDIR)/make/data/x11wrappergen @@ -69,12 +69,12 @@ # Run the tool on the offset files copied from the source repository to generate several Java classes # used in awt. -$(GENSRC_OUTPUTDIR)/java.desktop/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS_JDK) +$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS_JDK) $(MKDIR) -p $(GENSRC_X11WRAPPERS_DST) $(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes $(TOUCH) $@ -GENSRC_X11WRAPPERS += $(GENSRC_OUTPUTDIR)/java.desktop/_the.generated.x11 +GENSRC_X11WRAPPERS += $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated.x11 ifneq ($(COMPILE_TYPE), cross) # This is not a cross compile, regenerate the offset file, so that we
--- a/make/launcher/Launcher-java.base.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/launcher/Launcher-java.base.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -43,18 +43,18 @@ LIBS_windows := user32.lib comctl32.lib, \ RC_FLAGS := $(JAVA_RC_FLAGS), \ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/java_objs, \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ OPTIMIZATION := HIGH, \ WINDOWS_STATIC_LINK := true, \ NO_JAVA_MS := true, \ )) -$(MODULES_CMDS_OUTPUTDIR)/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) +$(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) $(MKDIR) -p $(@D) $(RM) $@ - $(CP) $(NATIVE_OUTPUTDIR)/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@ + $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@ -TARGETS += $(MODULES_CMDS_OUTPUTDIR)/java.base/java$(EXE_SUFFIX) +TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX) ifeq ($(OPENJDK_TARGET_OS), windows) $(eval $(call SetupBuildLauncher, javaw, \ @@ -76,7 +76,7 @@ BUILD_JEXEC := BUILD_JEXEC_SRC := BUILD_JEXEC_INC := -BUILD_JEXEC_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) # # UNHANDLED: @@ -109,7 +109,7 @@ endif ifeq ($(OPENJDK_TARGET_OS), linux) - BUILD_JEXEC_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/java.base + BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli endif endif @@ -129,7 +129,7 @@ CFLAGS_solaris := -KPIC, \ LDFLAGS := $(LDFLAGS_JDKEXE) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/jexec_obj, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \ OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \ DEBUG_SYMBOLS := true, \ PROGRAM := jexec)) @@ -142,8 +142,8 @@ BUILD_JSPAWNHELPER := BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava -BUILD_JSPAWNHELPER_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/java.base$(OPENJDK_TARGET_CPU_LIBDIR) -LINK_JSPAWNHELPER_OBJECTS := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjava/childproc.o +BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o BUILD_JSPAWNHELPER_LDFLAGS := ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) @@ -151,7 +151,7 @@ endif ifeq ($(OPENJDK_TARGET_OS), macosx) - BUILD_JSPAWNHELPER_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/java.base + BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base endif ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) @@ -166,7 +166,7 @@ CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \ LDFLAGS := $(LDFLAGS_JDKEXE) $(BUILD_JSPAWNHELPER_LDFLAGS), \ LIBS := $(LINK_JSPAWNHELPER_OBJECTS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/jspawnhelper, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \ OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \ PROGRAM := jspawnhelper))
--- a/make/launcher/Launcher-jdk.accessibility.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/launcher/Launcher-jdk.accessibility.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -42,8 +42,8 @@ DISABLED_WARNINGS_microsoft := 4267 4996, \ LDFLAGS := $(LDFLAGS_JDKEXE), \ LIBS := advapi32.lib version.lib user32.lib, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/jdk.accessibility/jabswitch, \ - OUTPUT_DIR := $(MODULES_CMDS_OUTPUTDIR)/jdk.accessibility, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \ PROGRAM := jabswitch, \ DEBUG_SYMBOLS := true, \ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
--- a/make/launcher/Launcher-jdk.pack200.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/launcher/Launcher-jdk.pack200.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -45,16 +45,16 @@ UNPACKEXE_LIBS := -lz else UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 - UNPACKEXE_ZIPOBJS := $(NATIVE_OUTPUTDIR)/java.base/libzip/zcrc32$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/deflate$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/trees$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/zadler32$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/compress$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/zutil$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/inflate$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/infback$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/inftrees$(OBJ_SUFFIX) \ - $(NATIVE_OUTPUTDIR)/java.base/libzip/inffast$(OBJ_SUFFIX) + UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/deflate$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/trees$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zadler32$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/compress$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zutil$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inflate$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/infback$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX) endif @@ -94,8 +94,8 @@ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ LIBS_solaris := -lc, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/unpackexe, \ - OUTPUT_DIR := $(MODULES_CMDS_OUTPUTDIR)/$(MODULE), \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \ PROGRAM := unpack200, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \
--- a/make/launcher/LauncherCommon.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/launcher/LauncherCommon.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -87,7 +87,7 @@ endif ifeq ($$($1_OUTPUT_DIR), ) - $1_OUTPUT_DIR := $(MODULES_CMDS_OUTPUTDIR)/$(MODULE) + $1_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE) endif ifeq ($$($1_OPTIMIZATION), ) @@ -128,14 +128,14 @@ endif $1_CFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"' - $1_LDFLAGS += -Wl,-all_load $(NATIVE_OUTPUTDIR)/java.base/libjli_static.a \ + $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \ -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) $1_LIBS += -framework Cocoa -framework Security \ -framework ApplicationServices endif ifeq ($(OPENJDK_TARGET_OS), aix) - $1_LDFLAGS += -L$(NATIVE_OUTPUTDIR)/java.base + $1_LDFLAGS += -L$(SUPPORT_OUTPUTDIR)/native/java.base $1_LIBS += -ljli_static endif @@ -145,10 +145,10 @@ ifeq ($$($1_WINDOWS_STATIC_LINK), true) $1_CFLAGS += $(filter-out -MD, $(CFLAGS_JDKEXE)) - $1_WINDOWS_JLI_LIB := $(NATIVE_OUTPUTDIR)/java.base/jli_static.lib + $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib else $1_CFLAGS += $(CFLAGS_JDKEXE) - $1_WINDOWS_JLI_LIB := $(NATIVE_OUTPUTDIR)/java.base/libjli/jli.lib + $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib endif # The linker on older SuSE distros (e.g. on SLES 10) complains with: @@ -188,20 +188,20 @@ $$($1_LDFLAGS), \ LDFLAGS_linux := \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ - -L$(MODULES_LIBS_OUTPUTDIR)/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \ LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ - -L$(MODULES_LIBS_OUTPUTDIR)/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ MAPFILE := $$($1_MAPFILE), \ LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ LIBS_unix := $$($1_LIBS_unix), \ LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ LIBS_windows := $$($1_WINDOWS_JLI_LIB) \ - $(NATIVE_OUTPUTDIR)/java.base/libjava/java.lib advapi32.lib \ + $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \ $$($1_LIBS_windows), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/$1_objs, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$1_objs, \ OUTPUT_DIR := $$($1_OUTPUT_DIR), \ PROGRAM := $1, \ DEBUG_SYMBOLS := true, \ @@ -220,11 +220,11 @@ TARGETS += $$($1) ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix)) - $$(BUILD_LAUNCHER_$1): $(NATIVE_OUTPUTDIR)/java.base/libjli_static.a + $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a endif ifeq ($(OPENJDK_TARGET_OS), windows) - $$(BUILD_LAUNCHER_$1): $(NATIVE_OUTPUTDIR)/java.base/libjava/java.lib \ + $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \ $$($1_WINDOWS_JLI_LIB) endif endef
--- a/make/lib/Awt2dLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Awt2dLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -23,7 +23,7 @@ # questions. # -WIN_AWT_LIB := $(NATIVE_OUTPUTDIR)/$(MODULE)/libawt/awt.lib +WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib ################################################################################ @@ -68,7 +68,7 @@ -D "JDK_FNAME=mlib_image.dll" \ -D "JDK_INTERNAL_NAME=mlib_image" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libmlib_image, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java) @@ -133,7 +133,7 @@ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libmlib_image_v, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java) @@ -168,7 +168,7 @@ LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c endif -LIBAWT_CFLAGS += -I$(HEADERS_OUTPUTDIR)/java.desktop \ +LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \ $(LIBJAVA_HEADER_FLAGS) \ $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \ @@ -210,7 +210,7 @@ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ - -I$(HEADERS_OUTPUTDIR)/java.base \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ # LIBAWT_EXFILES += \ java2d/d3d/D3DShaderGen.c \ @@ -278,7 +278,7 @@ -D "JDK_FNAME=awt.dll" \ -D "JDK_INTERNAL_NAME=awt" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libawt, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBAWT): $(call FindLib, java.base, java) @@ -308,7 +308,7 @@ LIBAWT_XAWT_EXCLUDES := medialib LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ @@ -368,7 +368,7 @@ -D "JDK_FNAME=xawt.dll" \ -D "JDK_INTERNAL_NAME=xawt" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libawt_xawt, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_xawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java) @@ -383,7 +383,7 @@ ################################################################################ LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms -LIBLCMS_CPPFLAGS += -I$(HEADERS_OUTPUTDIR)/java.desktop \ +LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ $(LIBJAVA_HEADER_FLAGS) \ @@ -432,7 +432,7 @@ -D "JDK_FNAME=lcms.dll" \ -D "JDK_INTERNAL_NAME=lcms" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/liblcms, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/liblcms, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBLCMS) @@ -493,7 +493,7 @@ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \ DISABLED_WARNINGS_clang := logical-op-parentheses, \ DISABLED_WARNINGS_microsoft := 4267, \ @@ -508,7 +508,7 @@ -D "JDK_INTERNAL_NAME=javajpeg" \ -D "JDK_FTYPE=0x2L", \ REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjavajpeg, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java) @@ -530,7 +530,7 @@ # LIBAWT_HEADLESS_EXCLUDES := medialib - LIBAWT_HEADLESS_CFLAGS := -I$(HEADERS_OUTPUTDIR)/java.desktop \ + LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ @@ -577,7 +577,7 @@ LIBS_unix := -lawt -ljvm -ljava, \ LIBS_linux := -lm $(LIBDL), \ LIBS_solaris := -lm $(LIBDL) $(LIBCXX) -lc, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libawt_headless, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) @@ -598,7 +598,7 @@ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ $(JDK_TOPDIR)/src/java.desktop/share/native/common \ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ $(LIBJAVA_HEADER_FLAGS) \ # @@ -672,7 +672,7 @@ -D "JDK_FNAME=fontmanager.dll" \ -D "JDK_INTERNAL_NAME=fontmanager" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libfontmanager, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) @@ -692,7 +692,7 @@ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ $(LIBJAVA_HEADER_FLAGS) \ @@ -717,14 +717,14 @@ -D "JDK_FNAME=jawt.dll" \ -D "JDK_INTERNAL_NAME=jawt" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjawt, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJAWT): $(BUILD_LIBAWT) $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT) $(ECHO) Copying $(@F) - $(CP) $(NATIVE_OUTPUTDIR)/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ + $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ TARGETS += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) @@ -776,7 +776,7 @@ LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ LIBS_solaris := $(X_LIBS) -lXrender, \ LIBS_macosx := -framework Cocoa, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjawt, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ifndef BUILD_HEADLESS_ONLY @@ -898,7 +898,7 @@ -D "JDK_FNAME=splashscreen.dll" \ -D "JDK_INTERNAL_NAME=splashscreen" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libsplashscreen, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBSPLASHSCREEN) @@ -922,7 +922,7 @@ LIBAWT_LWAWT_CFLAGS := \ $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \ @@ -974,7 +974,7 @@ -framework JavaRuntimeSupport \ -framework OpenGL \ -framework QuartzCore -ljava, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libawt_lwawt, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_lwawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBAWT_LWAWT) @@ -1004,7 +1004,7 @@ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ - -I$(HEADERS_OUTPUTDIR)/java.desktop, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -Xlinker -rpath -Xlinker @loader_path \ @@ -1016,7 +1016,7 @@ -framework JavaNativeFoundation \ -framework JavaRuntimeSupport \ -ljava -ljvm, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libosxui, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBOSXUI)
--- a/make/lib/CoreLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/CoreLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -23,7 +23,7 @@ # questions. # -WIN_VERIFY_LIB := $(NATIVE_OUTPUTDIR)/$(MODULE)/libverify/verify.lib +WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib ########################################################################################## # libfdlibm is statically linked with libjava below and not delivered into the @@ -41,7 +41,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ STATIC_LIBRARY := fdlibm, \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE), \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBFDLIBM_SRC), \ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ @@ -50,7 +50,7 @@ DISABLED_WARNINGS_gcc := sign-compare, \ DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libfdlibm, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) else @@ -59,14 +59,14 @@ # a plain static library. $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \ LIBRARY := fdlibm, \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libfdlibm, \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ SRC := $(LIBFDLIBM_SRC), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ LDFLAGS := -nostdlib -r -arch x86_64, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libfdlibm, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - BUILD_LIBFDLIBM := $(NATIVE_OUTPUTDIR)/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) + BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) $(call install-file) @@ -105,7 +105,7 @@ -D "JDK_INTERNAL_NAME=verify" \ -D "JDK_FTYPE=0x2L", \ REORDER := $(BUILD_LIBVERIFY_REORDER), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libverify, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \ DEBUG_SYMBOLS := true)) TARGETS += $(BUILD_LIBVERIFY) @@ -116,7 +116,7 @@ LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \ - -I$(HEADERS_OUTPUTDIR)/java.base \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ @@ -156,7 +156,7 @@ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_macosx := -L$(NATIVE_OUTPUTDIR)/$(MODULE)/, \ + LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ -export:getLastErrorString \ -export:getErrorString -delayload:shell32.dll, \ @@ -177,7 +177,7 @@ -D "JDK_INTERNAL_NAME=java" \ -D "JDK_FTYPE=0x2L", \ REORDER := $(LIBJAVA_REORDER), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjava, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJAVA) @@ -214,7 +214,7 @@ $(ZLIB_CPPFLAGS) \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ - -I$(HEADERS_OUTPUTDIR)/java.base, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ DISABLED_WARNINGS_gcc := parentheses, \ DISABLED_WARNINGS_clang := dangling-else, \ @@ -234,7 +234,7 @@ -D "JDK_FNAME=zip.dll" \ -D "JDK_INTERNAL_NAME=zip" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libzip, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -261,7 +261,7 @@ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \ - -I$(HEADERS_OUTPUTDIR)/java.base, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ CFLAGS_unix := -UDEBUG, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ @@ -279,7 +279,7 @@ -D "JDK_FNAME=jimage.dll" \ -D "JDK_INTERNAL_NAME=jimage" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjimage, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) @@ -395,7 +395,7 @@ -D "JDK_FNAME=jli.dll" \ -D "JDK_INTERNAL_NAME=jli" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJLI) @@ -406,14 +406,14 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ STATIC_LIBRARY := jli_static, \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE), \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli_static, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJLI_STATIC) @@ -425,33 +425,33 @@ # as this is first time I see it $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ LIBRARY := jli_static, \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE), \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ LDFLAGS := -nostdlib -r, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli_static, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) + $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) $(call install-file) - TARGETS += $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli_static.a + TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a else ifeq ($(OPENJDK_TARGET_OS), aix) # AIX also requires a static libjli because the compiler doesn't support '-rpath' $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ STATIC_LIBRARY := jli_static, \ - OUTPUT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE), \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjli_static)) + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static)) TARGETS += $(BUILD_LIBJLI_STATIC)
--- a/make/lib/Lib-java.instrument.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-java.instrument.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -35,7 +35,7 @@ # LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(LIBINSTRUMENT_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/java.instrument \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ # @@ -65,8 +65,8 @@ -L$(call FindLibDirForModule, java.base)/jli, \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ -L$(call FindLibDirForModule, java.base)/jli, \ - LDFLAGS_macosx := -Xlinker -all_load $(NATIVE_OUTPUTDIR)/java.base/libjli_static.a, \ - LDFLAGS_aix := -L$(NATIVE_OUTPUTDIR)/java.base, \ + LDFLAGS_macosx := -Xlinker -all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ + LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \ LDFLAGS_windows := -export:Agent_OnAttach, \ LIBS := $(JDKLIB_LIBS), \ LIBS_unix := -ljava $(LIBZ), \ @@ -76,17 +76,17 @@ LIBS_macosx := -liconv -framework Cocoa -framework Security \ -framework ApplicationServices, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \ - $(NATIVE_OUTPUTDIR)/java.base/jli_static.lib, \ + $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=instrument.dll" \ -D "JDK_INTERNAL_NAME=instrument" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libinstrument, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libinstrument, \ DEBUG_SYMBOLS := true)) ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix)) - $(BUILD_LIBINSTRUMENT): $(NATIVE_OUTPUTDIR)/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) + $(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) else $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli) endif
--- a/make/lib/Lib-java.management.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-java.management.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -34,7 +34,7 @@ $(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$(HEADERS_OUTPUTDIR)/java.management \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.management \ $(LIBJAVA_HEADER_FLAGS) \ # @@ -63,7 +63,7 @@ -D "JDK_FNAME=management.dll" \ -D "JDK_INTERNAL_NAME=management" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libmanagement, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement, \ DEBUG_SYMBOLS := true)) $(BUILD_LIBMANAGEMENT): $(call FindLib, java.base, java)
--- a/make/lib/Lib-java.prefs.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-java.prefs.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -54,7 +54,7 @@ -D "JDK_FNAME=prefs.dll" \ -D "JDK_INTERNAL_NAME=prefs" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libprefs, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libprefs, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBPREFS): $(call FindLib, java.base, java)
--- a/make/lib/Lib-java.security.jgss.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-java.security.jgss.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -39,13 +39,13 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/java.security.jgss, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(LIBDL), \ LIBS_solaris := -lc, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libj2gss, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2gss, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJ2GSS) @@ -81,7 +81,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(BUILD_LIBKRB5_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/java.security.jgss, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \ DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -91,7 +91,7 @@ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \ -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libkrb5, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libkrb5, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBKRB5)
--- a/make/lib/Lib-java.smartcardio.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-java.smartcardio.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -31,7 +31,7 @@ $(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \ -I$(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE \ - -I$(HEADERS_OUTPUTDIR)/java.smartcardio + -I$(SUPPORT_OUTPUTDIR)/headers/java.smartcardio $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \ LIBRARY := j2pcsc, \ @@ -51,7 +51,7 @@ -D "JDK_FNAME=j2pcsc.dll" \ -D "JDK_INTERNAL_NAME=j2pcsc" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libj2pcsc, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2pcsc, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJ2PCSC)
--- a/make/lib/Lib-jdk.accessibility.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.accessibility.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -33,7 +33,7 @@ JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo - ACCESSBRIDGE_CFLAGS := -I$(HEADERS_OUTPUTDIR)/jdk.accessibility \ + ACCESSBRIDGE_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \ -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include @@ -53,17 +53,17 @@ LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows, \ LIBS := kernel32.lib user32.lib gdi32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \ - $(NATIVE_OUTPUTDIR)/java.desktop/libjawt/jawt.lib \ + $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=javaaccessbridge$1.dll" \ -D "JDK_INTERNAL_NAME=javaaccessbridge$1" \ -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjavaaccessbridge$1, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavaaccessbridge$1, \ DEBUG_SYMBOLS := true) - $$(BUILD_JAVAACCESSBRIDGE$1): $(NATIVE_OUTPUTDIR)/java.desktop/libjawt/jawt.lib + $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1) endef @@ -90,7 +90,7 @@ -D "JDK_FNAME=windowsaccessbridge$1.dll" \ -D "JDK_INTERNAL_NAME=windowsaccessbridge$1" \ -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libwindowsaccessbridge$1, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libwindowsaccessbridge$1, \ DEBUG_SYMBOLS := true) TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1) @@ -112,7 +112,7 @@ -D "JDK_FNAME=jabsysinfo.dll" \ -D "JDK_INTERNAL_NAME=jabsysinfo" \ -D "JDK_FTYPE=0x02L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/lib/libjabsysinfo, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lib/libjabsysinfo, \ DEBUG_SYMBOLS := true) TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
--- a/make/lib/Lib-jdk.attach.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.attach.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -40,7 +40,7 @@ SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(HEADERS_OUTPUTDIR)/jdk.attach \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \ $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \ CFLAGS_windows := /Gy, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \ @@ -55,7 +55,7 @@ LIBS := $(JDKLIB_LIBS), \ LIBS_solaris := -ldoor, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libattach, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libattach, \ DEBUG_SYMBOLS := true)) $(BUILD_LIBATTACH): $(call FindLib, java.base, java)
--- a/make/lib/Lib-jdk.crypto.ec.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.crypto.ec.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -67,7 +67,7 @@ -D "JDK_FNAME=sunec.dll" \ -D "JDK_INTERNAL_NAME=sunec" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libsunec, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsunec, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBSUNEC)
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.crypto.mscapi.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -46,7 +46,7 @@ -D "JDK_FNAME=sunmscapi.dll" \ -D "JDK_INTERNAL_NAME=sunmscapi" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libsunmscapi, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsunmscapi, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBSUNMSCAPI)
--- a/make/lib/Lib-jdk.crypto.pkcs11.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.crypto.pkcs11.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -37,7 +37,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/jdk.crypto.pkcs11, \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.pkcs11, \ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ DISABLED_WARNINGS_microsoft := 4013 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ @@ -50,7 +50,7 @@ -D "JDK_FNAME=j2pkcs11.dll" \ -D "JDK_INTERNAL_NAME=j2pkcs11" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libj2pkcs11, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2pkcs11, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBJ2PKCS11)
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -43,7 +43,7 @@ LDFLAGS := $(LDFLAGS_JDKLIB), \ LIBS := $(LIBDL), \ LIBS_solaris := -lc, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libj2ucrypto, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2ucrypto, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
--- a/make/lib/Lib-jdk.deploy.osx.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.deploy.osx.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -38,7 +38,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ -I$(LIBAPPLESCRIPTENGINE_SRC) \ - -I$(HEADERS_OUTPUTDIR)/jdk.deploy.osx, \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.deploy.osx, \ DISABLED_WARNINGS_clang := implicit-function-declaration format, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -46,7 +46,7 @@ -framework Carbon \ -framework JavaNativeFoundation \ $(JDKLIB_LIBS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libAppleScriptEngine, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libAppleScriptEngine, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBAPPLESCRIPTENGINE): $(call FindLib, java.base, java) @@ -59,8 +59,8 @@ LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ - -I$(HEADERS_OUTPUTDIR)/jdk.deploy.osx \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.deploy.osx \ # $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \ @@ -72,7 +72,7 @@ $(LIBOSX_CFLAGS), \ DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - -L$(MODULES_LIBS_OUTPUTDIR)/java.desktop \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := \ -losxapp \ @@ -82,7 +82,7 @@ -framework JavaRuntimeSupport \ -framework SystemConfiguration \ $(JDKLIB_LIBS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libosx, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosx, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBOSX)
--- a/make/lib/Lib-jdk.internal.le.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.internal.le.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -33,7 +33,7 @@ # LIBLE_CPPFLAGS := \ $(addprefix -I, $(LIBLE_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/jdk.internal.le \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.internal.le \ # $(eval $(call SetupNativeCompilation,BUILD_LIBLE, \ @@ -50,7 +50,7 @@ -D "JDK_FNAME=le.dll" \ -D "JDK_INTERNAL_NAME=le" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/lible, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lible, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBLE)
--- a/make/lib/Lib-jdk.jdi.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.jdi.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -36,7 +36,7 @@ $(addprefix -I, $(LIBDT_SHMEM_SRC)) \ -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \ -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \ - -I$(HEADERS_OUTPUTDIR)/jdk.jdi \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdi \ # $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \ @@ -54,7 +54,7 @@ -D "JDK_FNAME=dt_shmem.dll" \ -D "JDK_INTERNAL_NAME=dt_shmem" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libdt_shmem, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libdt_shmem, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBDT_SHMEM)
--- a/make/lib/Lib-jdk.jdwp.agent.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.jdwp.agent.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -55,7 +55,7 @@ -D "JDK_FNAME=dt_socket.dll" \ -D "JDK_INTERNAL_NAME=dt_socket" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libdt_socket, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libdt_socket, \ DEBUG_SYMBOLS := true)) $(BUILD_LIBDT_SOCKET): $(call FindLib, java.base, java) @@ -80,7 +80,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \ $(LIBJDWP_CPPFLAGS) \ - -I$(HEADERS_OUTPUTDIR)/jdk.jdwp.agent, \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -94,7 +94,7 @@ -D "JDK_FNAME=jdwp.dll" \ -D "JDK_INTERNAL_NAME=jdwp" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjdwp, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjdwp, \ DEBUG_SYMBOLS := true)) $(BUILD_LIBJDWP): $(call FindLib, java.base, java)
--- a/make/lib/Lib-jdk.management.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.management.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -35,7 +35,7 @@ $(JDK_TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS)/native/libmanagement_ext LIBMANAGEMENT_EXT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \ $(addprefix -I,$(LIBMANAGEMENT_EXT_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/jdk.management \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management \ $(LIBJAVA_HEADER_FLAGS) \ # @@ -72,7 +72,7 @@ -D "JDK_FNAME=management_ext.dll" \ -D "JDK_INTERNAL_NAME=management_ext" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libmanagement_ext, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement_ext, \ DEBUG_SYMBOLS := true)) $(BUILD_LIBMANAGEMENT_EXT): $(call FindLib, java.base, java)
--- a/make/lib/Lib-jdk.pack200.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.pack200.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -36,17 +36,17 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CXXFLAGS_JDKLIB) \ -DNO_ZLIB -DUNPACK_JNI -DFULL \ - -I$(HEADERS_OUTPUTDIR)/java.base \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ $(LIBJAVA_HEADER_FLAGS), \ CFLAGS_release := -DPRODUCT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := -map:$(NATIVE_OUTPUTDIR)/$(MODULE)/unpack.map -debug, \ + LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \ LIBS_unix := -ljvm $(LIBCXX) -ljava -lc, \ LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libunpack, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libunpack, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=unpack.dll" \
--- a/make/lib/Lib-jdk.sctp.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.sctp.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -43,8 +43,8 @@ -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \ $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/jdk.sctp \ - -I$(HEADERS_OUTPUTDIR)/java.base, \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ DISABLED_WARNINGS_gcc := unused-parameter, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ @@ -52,7 +52,7 @@ LIBS_unix := -lnio -lnet -ljava -ljvm, \ LIBS_linux := -lpthread $(LIBDL), \ LIBS_solaris := -lsocket -lc, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libsctp, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBSCTP)
--- a/make/lib/Lib-jdk.security.auth.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/Lib-jdk.security.auth.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -43,7 +43,7 @@ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) -I$(HEADERS_OUTPUTDIR)/jdk.security.auth, \ + CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \ MAPFILE := $(LIBJAAS_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -54,7 +54,7 @@ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjaas, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjaas, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJAAS): $(call FindLib, java.base, java)
--- a/make/lib/LibCommon.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/LibCommon.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -31,7 +31,7 @@ # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more # elegant solution to this. -WIN_JAVA_LIB := $(NATIVE_OUTPUTDIR)/java.base/libjava/java.lib +WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib ifdef OPENJDK # Build everything with debugging on OpenJDK
--- a/make/lib/NetworkingLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/NetworkingLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -30,7 +30,7 @@ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBNET_SRC_DIRS), \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) -I$(HEADERS_OUTPUTDIR)/java.base \ + CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ $(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(LIBNET_SRC_DIRS)), \ DISABLED_WARNINGS_gcc := format-nonliteral, \ DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \ @@ -51,7 +51,7 @@ -D "JDK_FNAME=net.dll" \ -D "JDK_INTERNAL_NAME=net" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libnet, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBNET): $(BUILD_LIBJAVA)
--- a/make/lib/NioLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/NioLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -36,7 +36,7 @@ BUILD_LIBNIO_CFLAGS := \ $(addprefix -I, $(BUILD_LIBNIO_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/java.base \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ $(LIBJAVA_HEADER_FLAGS) \ $(addprefix -I, $(BUILD_LIBNET_SRC)) @@ -80,14 +80,14 @@ LIBS_macosx := \ -framework CoreFoundation -framework CoreServices, \ LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ - $(NATIVE_OUTPUTDIR)/$(MODULE)/libnet/net.lib \ + $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet/net.lib \ advapi32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=nio.dll" \ -D "JDK_INTERNAL_NAME=nio" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libnio, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnio, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBNIO)
--- a/make/lib/PlatformLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/PlatformLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -36,7 +36,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(LIBOSXAPP_SRC)) \ - -I$(HEADERS_OUTPUTDIR)/java.desktop, \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ DISABLED_WARNINGS_clang := objc-method-access objc-root-class, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -53,7 +53,7 @@ -framework OpenGL \ -framework IOSurface \ -framework QuartzCore, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libosxapp, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxapp, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) TARGETS += $(BUILD_LIBOSXAPP)
--- a/make/lib/SecurityLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/SecurityLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -32,7 +32,7 @@ LIBOSXSECURITY_DIRS := $(JDK_TOPDIR)/src/java.base/macosx/native/libosxsecurity LIBOSXSECURITY_CFLAGS := -I$(LIBOSXSECURITY_DIRS) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(HEADERS_OUTPUTDIR)/java.base \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXSECURITY, \ LIBRARY := osxsecurity, \ @@ -43,7 +43,7 @@ $(LIBOSXSECURITY_CFLAGS), \ DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - -L$(MODULES_LIBS_OUTPUTDIR)/java.base \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -fobjc-link-runtime, \ LIBS := \ @@ -51,7 +51,7 @@ -framework CoreServices \ -framework Security \ $(JDKLIB_LIBS), \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libosxsecurity, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxsecurity, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBOSXSECURITY): $(BUILD_LIBJAVA)
--- a/make/lib/SoundLibraries.gmk Tue Nov 17 15:13:05 2015 -0800 +++ b/make/lib/SoundLibraries.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -28,7 +28,7 @@ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjsound \ # LIBJSOUND_CFLAGS := \ - -I$(HEADERS_OUTPUTDIR)/java.desktop \ + -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ $(LIBJAVA_HEADER_FLAGS) \ $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \ # @@ -137,7 +137,7 @@ -D "JDK_FNAME=jsound.dll" \ -D "JDK_INTERNAL_NAME=jsound" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjsound, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsound, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA) @@ -172,7 +172,7 @@ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(ALSA_LIBS) -ljava -ljvm, \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjsoundalsa, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundalsa, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA) @@ -203,7 +203,7 @@ -D "JDK_FNAME=jsoundds.dll" \ -D "JDK_INTERNAL_NAME=jsoundds" \ -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libjsoundds, \ + OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundds, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)