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.
Merge
authorprr
Tue, 16 Jun 2015 13:00:47 -0700
changeset 31309 15a47f7751da
parent 31308 97ab382f3311 (diff)
parent 31119 d69c968463f0 (current diff)
child 31310 481585782338
Merge
jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationException.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jmap/heapconfig/LingeredApp.java file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jmap/heapconfig/LingeredAppTest.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/Dependency.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyCollector.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyScanner.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PackageDependency.java file | annotate | diff | comparison | revisions
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/TypeAndSupertypesDependency.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/DependencyCollection.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/nondependency/pkg26/Cls26.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg/Test.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg10/Cls10.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg11/Cls11.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg12/Cls12.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg13/Cls13.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg14/Cls14.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg15/Cls15.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg16/Cls16.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg17/Cls17.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg18/Cls18.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg19/Cls19.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg2/Cls2.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg20/Anno20.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg21/Cls21.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg22/Anno22.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg23/Cls23.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg24/Cls24.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg25/Cls25.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg27/Cls27.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg28/Cls28.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg29/Cls29.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg3/Cls3.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg30/Cls30.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg4/Cls4.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg5/Anno5.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg6/Cls6.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg7/Cls7.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg8/Cls8.java file | annotate | diff | comparison | revisions
langtools/test/tools/sjavac/test-input/src/pkg9/Cls9.java file | annotate | diff | comparison | revisions 
--- a/make/Images.gmk	Wed Jul 05 20:38:06 2017 +0200
+++ b/make/Images.gmk	Tue Jun 16 13:00:47 2015 -0700
@@ -38,7 +38,8 @@
 ############################################################################
 
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
-               jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom
+               jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
+               jdk.accessibility
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
@@ -57,10 +58,6 @@
   PROVIDER_MODULES += jdk.crypto.ucrypto
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  MAIN_MODULES += jdk.accessibility
-endif
-
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   MAIN_MODULES += jdk.deploy.osx
 endif
jdk-sandbox