Merge pull request #319 from dicej/master

fix crash in Posix_getaddrinfo for ProGuarded Android build

README.md

@@ -507,7 +507,7 @@ setting the boot classpath to "[bootJar]".
     $ cat >embedded-jar-main.cpp <<EOF
     #include "stdint.h"
     #include "jni.h"
-	#include "stdlib.h" 
+    #include "stdlib.h" 
     
     #if (defined __MINGW32__) || (defined _MSC_VER)
     #  define EXPORT __declspec(dllexport)

android.pro

@@ -34,7 +34,9 @@
 -keep class java.net.Socket
 -keep class java.net.SocketImpl
 -keep class java.lang.String
--keep class libcore.io.StructAddrinfo
+-keep class libcore.io.StructAddrinfo {
+   <fields>;
+ }
 -keep class libcore.io.StructFlock
 -keep class libcore.io.StructGroupReq
 -keep class libcore.io.StructLinger

makefile

@@ -1294,8 +1294,8 @@ ifneq ($(lzma),)
 
 	lzma-encoder = $(build)/lzma/lzma
 
-	lzma-build-cflags = -D_7ZIP_ST -D__STDC_CONSTANT_MACROS -fno-rtti \
-		-fno-exceptions -I$(lzma)/C
+	lzma-build-cflags = -D_7ZIP_ST -D__STDC_CONSTANT_MACROS \
+		-fno-exceptions -fPIC -I$(lzma)/C
 
 	lzma-cflags = $(lzma-build-cflags) $(classpath-extra-cflags)