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

Merge pull request #160 from dicej/master

Browse Source 
fix ProGuarded OpenJDK build and LZMA-compressed jar support
This commit is contained in:
Joshua Warner 2014-01-19 09:17:14 -08:00
commit c4112db0b9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -503,7 +503,7 @@ compress the jar before generating the object:
boot.jar.lzma boot-jar.o _binary_boot_jar_start _binary_boot_jar_end \ boot.jar.lzma boot-jar.o _binary_boot_jar_start _binary_boot_jar_end \
${platform} ${arch} ${platform} ${arch}
Note that you'll need to specify "-Xbootclasspath:[lzma:bootJar]" Note that you'll need to specify "-Xbootclasspath:[lzma.bootJar]"
instead of "-Xbootclasspath:[bootJar]" in the next step if you've used instead of "-Xbootclasspath:[bootJar]" in the next step if you've used
LZMA to compress the jar. LZMA to compress the jar.

4
openjdk.pro
View File

@ -9,6 +9,10 @@
public void run(); public void run();
} }
-keepclassmembers class java.lang.ThreadGroup {
void threadTerminated(java.lang.Thread);
}
-keep class java.lang.System { -keep class java.lang.System {
private static void initializeSystemClass(); private static void initializeSystemClass();
public static void setProperties(java.util.Properties); public static void setProperties(java.util.Properties);

2
src/finder.cpp
View File

@ -566,7 +566,7 @@ class BuiltinElement: public JarElement {
virtual void init() { virtual void init() {
if (index == 0) { if (index == 0) {
if (s->success(s->load(&library, libraryName))) { if (s->success(s->load(&library, libraryName))) {
bool lzma = strncmp("lzma:", name, 5) == 0; bool lzma = strncmp("lzma.", name, 5) == 0;
const char* symbolName = lzma ? name + 5 : name; const char* symbolName = lzma ? name + 5 : name;
void* p = library->resolve(symbolName); void* p = library->resolve(symbolName);