From 02995ccbf64c6e2e341f3b518cab8d6619785fc2 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 8 Feb 2015 00:05:14 +0200
Subject: [PATCH] Fixed OpenSSL compilation

---
 project/jni/openssl/Android.mk                    |  14 ++++++++++++--
 project/jni/openssl/compile.sh                    |   7 +++----
 .../libcrypto.a}                                  | Bin
 .../libssl.a}                                     | Bin
 .../libcrypto.a}                                  | Bin
 .../{libssl-armeabi.a => lib-armeabi/libssl.a}    | Bin
 .../{libcrypto-mips.a => lib-mips/libcrypto.a}    | Bin
 .../openssl/{libssl-mips.a => lib-mips/libssl.a}  | Bin
 .../{libcrypto-x86.a => lib-x86/libcrypto.a}      | Bin
 .../openssl/{libssl-x86.a => lib-x86/libssl.a}    | Bin
 10 files changed, 15 insertions(+), 6 deletions(-)
 rename project/jni/openssl/{libcrypto-armeabi-v7a.a => lib-armeabi-v7a/libcrypto.a} (100%)
 rename project/jni/openssl/{libssl-armeabi-v7a.a => lib-armeabi-v7a/libssl.a} (100%)
 rename project/jni/openssl/{libcrypto-armeabi.a => lib-armeabi/libcrypto.a} (100%)
 rename project/jni/openssl/{libssl-armeabi.a => lib-armeabi/libssl.a} (100%)
 rename project/jni/openssl/{libcrypto-mips.a => lib-mips/libcrypto.a} (100%)
 rename project/jni/openssl/{libssl-mips.a => lib-mips/libssl.a} (100%)
 rename project/jni/openssl/{libcrypto-x86.a => lib-x86/libcrypto.a} (100%)
 rename project/jni/openssl/{libssl-x86.a => lib-x86/libssl.a} (100%)

diff --git a/project/jni/openssl/Android.mk b/project/jni/openssl/Android.mk
index c31f7df3b..f802caa96 100644
--- a/project/jni/openssl/Android.mk
+++ b/project/jni/openssl/Android.mk
@@ -1,9 +1,19 @@
-ifneq ($(notdir $(LOCAL_PATH)),openssl)
+LOCAL_PATH:=$(call my-dir)
 
 include $(CLEAR_VARS)
+
 LOCAL_MODULE := $(notdir $(LOCAL_PATH))
+
+ifneq (openssl,$(LOCAL_MODULE))
+
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+LOCAL_SRC_FILES := lib-$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+LOCAL_BUILT_MODULE := # This fixes a bug in NDK r10d
+
+# NDK is buggy meh
+obj/local/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a: $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
+	cp -f $< $@
+
 include $(PREBUILT_STATIC_LIBRARY)
 
 endif
diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh
index 49637efcf..a13b86cb1 100755
--- a/project/jni/openssl/compile.sh
+++ b/project/jni/openssl/compile.sh
@@ -12,10 +12,9 @@ echo APP_MODULES := libcrypto_static libssl_static > openssl/jni/Application.mk
 echo APP_ABI := $ARCH_LIST >> openssl/jni/Application.mk
 ndk-build -j8 -C openssl BUILD_HOST_SHARED_LIBRARY=jni/Apps.mk BUILD_HOST_STATIC_LIBRARY=jni/Apps.mk || exit 1
 for ARCH in $ARCH_LIST; do
-	mkdir -p openssl/$ARCH/lib
-	ln -s -f ../jni/include openssl/$ARCH/include
-	cp -f openssl/obj/local/$ARCH/libcrypto_static.a libcrypto-$ARCH.a || exit 1
-	cp -f openssl/obj/local/$ARCH/libssl_static.a libssl-$ARCH.a || exit 1
+	mkdir -p lib-$(ARCH)
+	cp -f openssl/obj/local/$ARCH/libcrypto_static.a lib-$(ARCH)/libcrypto.a || exit 1
+	cp -f openssl/obj/local/$ARCH/libssl_static.a lib-$(ARCH)/libssl.a || exit 1
 done
 rm -rf include
 mv openssl/jni/include ./
diff --git a/project/jni/openssl/libcrypto-armeabi-v7a.a b/project/jni/openssl/lib-armeabi-v7a/libcrypto.a
similarity index 100%
rename from project/jni/openssl/libcrypto-armeabi-v7a.a
rename to project/jni/openssl/lib-armeabi-v7a/libcrypto.a
diff --git a/project/jni/openssl/libssl-armeabi-v7a.a b/project/jni/openssl/lib-armeabi-v7a/libssl.a
similarity index 100%
rename from project/jni/openssl/libssl-armeabi-v7a.a
rename to project/jni/openssl/lib-armeabi-v7a/libssl.a
diff --git a/project/jni/openssl/libcrypto-armeabi.a b/project/jni/openssl/lib-armeabi/libcrypto.a
similarity index 100%
rename from project/jni/openssl/libcrypto-armeabi.a
rename to project/jni/openssl/lib-armeabi/libcrypto.a
diff --git a/project/jni/openssl/libssl-armeabi.a b/project/jni/openssl/lib-armeabi/libssl.a
similarity index 100%
rename from project/jni/openssl/libssl-armeabi.a
rename to project/jni/openssl/lib-armeabi/libssl.a
diff --git a/project/jni/openssl/libcrypto-mips.a b/project/jni/openssl/lib-mips/libcrypto.a
similarity index 100%
rename from project/jni/openssl/libcrypto-mips.a
rename to project/jni/openssl/lib-mips/libcrypto.a
diff --git a/project/jni/openssl/libssl-mips.a b/project/jni/openssl/lib-mips/libssl.a
similarity index 100%
rename from project/jni/openssl/libssl-mips.a
rename to project/jni/openssl/lib-mips/libssl.a
diff --git a/project/jni/openssl/libcrypto-x86.a b/project/jni/openssl/lib-x86/libcrypto.a
similarity index 100%
rename from project/jni/openssl/libcrypto-x86.a
rename to project/jni/openssl/lib-x86/libcrypto.a
diff --git a/project/jni/openssl/libssl-x86.a b/project/jni/openssl/lib-x86/libssl.a
similarity index 100%
rename from project/jni/openssl/libssl-x86.a
rename to project/jni/openssl/lib-x86/libssl.a