8148187: Remove OS X-specific com.apple.concurrent package
Removed jdk.deploy.osx module (including com.apple.concurrent) Reviewed-by: alanb, erikj, mchung
This commit is contained in:
parent
11def8caf1
commit
685358ed93
|
@ -1293,12 +1293,8 @@ jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/win
|
|||
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
|
||||
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
|
||||
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
|
||||
jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html : jdk/src/macosx/classes/com/apple/concurrent/package.html
|
||||
jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent : jdk/src/macosx/classes/com/apple/concurrent
|
||||
jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
|
||||
jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
|
||||
jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m
|
||||
jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
|
||||
jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
|
||||
jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
|
||||
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
|
||||
jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver
|
||||
jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
|
||||
|
|
|
@ -62,10 +62,6 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
|
|||
PROVIDER_MODULES += jdk.crypto.ucrypto
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
MAIN_MODULES += jdk.deploy.osx
|
||||
endif
|
||||
|
||||
JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES))
|
||||
JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES))
|
||||
|
||||
|
|
|
@ -413,9 +413,6 @@ else
|
|||
# Declare dependencies from all other <module>-lib to java.base-lib
|
||||
$(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
|
||||
$(eval $t: java.base-libs))
|
||||
# Declare the special case dependency for jdk.deploy.osx where libosx
|
||||
# links against libosxapp.
|
||||
jdk.deploy.osx-libs: java.desktop-libs
|
||||
|
||||
# jdk.accessibility depends on java.desktop
|
||||
jdk.accessibility-libs: java.desktop-libs
|
||||
|
|
|
@ -98,8 +98,7 @@ SMARTCARDIO_PKGS = javax.smartcardio
|
|||
SCTPAPI_PKGS = com.sun.nio.sctp
|
||||
|
||||
ifeq ($(PLATFORM), macosx)
|
||||
APPLE_EXT_PKGS = com.apple.concurrent \
|
||||
com.apple.eawt \
|
||||
APPLE_EXT_PKGS = com.apple.eawt \
|
||||
com.apple.eawt.event \
|
||||
com.apple.eio
|
||||
endif
|
||||
|
|
|
@ -300,7 +300,6 @@
|
|||
<to>java.xml</to>
|
||||
<to>jdk.charsets</to>
|
||||
<to>jdk.crypto.pkcs11</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.httpserver</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.jconsole</to>
|
||||
|
@ -421,7 +420,6 @@
|
|||
<export>
|
||||
<name>sun.security.pkcs</name>
|
||||
<to>jdk.crypto.ec</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.jartool</to>
|
||||
</export>
|
||||
<export>
|
||||
|
@ -462,7 +460,6 @@
|
|||
<to>jdk.crypto.mscapi</to>
|
||||
<to>jdk.crypto.pkcs11</to>
|
||||
<to>jdk.crypto.ucrypto</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.policytool</to>
|
||||
<to>jdk.security.auth</to>
|
||||
|
@ -473,7 +470,6 @@
|
|||
<to>java.naming</to>
|
||||
<to>jdk.crypto.ec</to>
|
||||
<to>jdk.crypto.pkcs11</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.security.auth</to>
|
||||
</export>
|
||||
|
@ -1706,11 +1702,6 @@
|
|||
<name>jdk.crypto.ucrypto</name>
|
||||
<depend>java.base</depend>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.deploy.osx</name>
|
||||
<depend>java.base</depend>
|
||||
<depend>java.desktop</depend>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.dev</name>
|
||||
<depend>java.base</depend>
|
||||
|
|
Loading…
Reference in New Issue