make/Images.gmk

*** 36,46 ****
  $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
  
  ############################################################################
  
  MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
!                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom
  
  # providers
  PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
                 jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
  
--- 36,47 ----
  $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
  
  ############################################################################
  
  MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
!                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 \
                 jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
  
*** 55,68 ****
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    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
  
  JRE_MODULES := $(MAIN_MODULES) $(PROVIDER_MODULES)
--- 56,65 ----