Fixed OpenSSL compilation

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

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
+	mkdir -p lib-$(ARCH)
-	ln -s -f ../jni/include openssl/$ARCH/include
+	cp -f openssl/obj/local/$ARCH/libcrypto_static.a lib-$(ARCH)/libcrypto.a || exit 1
-	cp -f openssl/obj/local/$ARCH/libcrypto_static.a libcrypto-$ARCH.a || exit 1
+	cp -f openssl/obj/local/$ARCH/libssl_static.a lib-$(ARCH)/libssl.a || exit 1
-	cp -f openssl/obj/local/$ARCH/libssl_static.a libssl-$ARCH.a || exit 1
 done
 rm -rf include
 mv openssl/jni/include ./