ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into dicej

Browse Source 
Conflicts:
	makefile
This commit is contained in:
Joel Dice 2013-02-27 10:09:38 -07:00
commit 3eda6ab0a2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -1677,7 +1677,7 @@ executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects) $(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
unittest-executable-objects = $(unittest-objects) $(vm-objects) \ unittest-executable-objects = $(unittest-objects) $(vm-objects) \
$(classpath-objects) $(classpath-objects)
ifeq ($(process),interpret) ifeq ($(process),interpret)
unittest-executable-objects += $(all-codegen-target-objects) unittest-executable-objects += $(all-codegen-target-objects)

1
openjdk.pro
View File

@ -136,6 +136,7 @@
public InetSocketAddress(java.net.InetAddress, int); public InetSocketAddress(java.net.InetAddress, int);
} }
-keep class java.net.ServerSocket -keep class java.net.ServerSocket
-keep class java.net.SocketTimeoutException
-keepclassmembers class java.net.PlainSocketImpl { -keepclassmembers class java.net.PlainSocketImpl {
<fields>; <fields>;