changeset 2246:2621705c0d5a

Merge
author amurillo
date Wed, 14 Sep 2016 11:22:38 -0700
parents 4ad4af1f5ce5 46e9e983e97b
children d7f519b00425
files
diffstat 3 files changed, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Sat Sep 10 12:18:30 2016 -0700
+++ b/make/CompileJavaModules.gmk	Wed Sep 14 11:22:38 2016 -0700
@@ -458,7 +458,7 @@
 jdk.localedata_COPY := _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
 
 ################################################################################
 # Setup the compilation for the module
--- a/make/CreateJmods.gmk	Sat Sep 10 12:18:30 2016 -0700
+++ b/make/CreateJmods.gmk	Wed Sep 14 11:22:38 2016 -0700
@@ -82,14 +82,6 @@
   endif
 endif
 
-ifeq ($(MODULE), jdk.scripting.nashorn.shell)
-  JMOD_FLAGS += --main-class jdk.nashorn.tools.jjs.Main
-endif
-
-ifeq ($(MODULE), jdk.scripting.nashorn)
-  JMOD_FLAGS += --main-class jdk.nashorn.tools.Shell
-endif
-
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.
--- a/make/Images.gmk	Sat Sep 10 12:18:30 2016 -0700
+++ b/make/Images.gmk	Wed Sep 14 11:22:38 2016 -0700
@@ -75,11 +75,6 @@
 
 # Param 1 - The file containing the MODULES list
 define create-info-file
-  $(call info-file-item, "JAVA_VERSION", "$(VERSION_NUMBER)")
-  $(call info-file-item, "JAVA_FULL_VERSION", "$(VERSION_STRING)")
-  $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
-  $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
-  $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
   $(if $(JDK_ARCH_ABI_PROP_NAME), \
     $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
   $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))")