mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
Merge pull request #160 from dicej/master
fix ProGuarded OpenJDK build and LZMA-compressed jar support
This commit is contained in:
commit
c4112db0b9
@ -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 \
|
||||
${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
|
||||
LZMA to compress the jar.
|
||||
|
||||
|
@ -9,6 +9,10 @@
|
||||
public void run();
|
||||
}
|
||||
|
||||
-keepclassmembers class java.lang.ThreadGroup {
|
||||
void threadTerminated(java.lang.Thread);
|
||||
}
|
||||
|
||||
-keep class java.lang.System {
|
||||
private static void initializeSystemClass();
|
||||
public static void setProperties(java.util.Properties);
|
||||
|
@ -566,7 +566,7 @@ class BuiltinElement: public JarElement {
|
||||
virtual void init() {
|
||||
if (index == 0) {
|
||||
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;
|
||||
|
||||
void* p = library->resolve(symbolName);
|
||||
|
Loading…
Reference in New Issue
Block a user