Permalink
Browse files

Merge pull request #160 from dicej/master

fix ProGuarded OpenJDK build and LZMA-compressed jar support
  • Loading branch information...
joshuawarner32 committed Jan 19, 2014
2 parents c730a93 + 7ec7fe7 commit c4112db0b9a8934767cd11baad37079ef7f87a77
Showing with 6 additions and 2 deletions.
  1. +1 −1 README.md
  2. +4 −0 openjdk.pro
  3. +1 −1 src/finder.cpp
View
@@ -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.
View
@@ -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);
View
@@ -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);

0 comments on commit c4112db

Please sign in to comment.