From de48de6ba138affecc9920468ebc094f55a88203 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 27 Jul 2022 10:31:55 +0200 Subject: [PATCH] JNI-178 Android-Build: Use make install for openssl instead of manually copying lib files It was not copying the include dir files nor generating the pkgconfig files. Make install have the caveat of also installing docs, which we don't need for the build, but did not find a way to disable them. --- android/external/arm64-v8a/Makefile | 8 ++------ android/external/armeabi-v7a/Makefile | 8 ++------ android/external/x86/Makefile | 8 ++------ android/external/x86_64/Makefile | 6 +----- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile index a003c2b..fc1a475 100644 --- a/android/external/arm64-v8a/Makefile +++ b/android/external/arm64-v8a/Makefile @@ -209,12 +209,8 @@ openssl/libssl.so: | openssl/Makefile PATH="$(ANDROID_NDK_HOME)/bin:$(PATH)" $(MAKE) -C openssl $(LOCAL)/lib/libssl.so: openssl/libssl.so - cd openssl && \ - cp libcrypto.so $(LOCAL)/lib && \ - cp libcrypto.a $(LOCAL)/lib && \ - cp libssl.so $(LOCAL)/lib && \ - cp libssl.a $(LOCAL)/lib - ls -l $(LOCAL)/lib/libssl.so + $(MAKE) -C openssl install + ls -l $(LOCAL)/lib openssl-build: openssl/libssl.so diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile index 03174bc..8a2991c 100644 --- a/android/external/armeabi-v7a/Makefile +++ b/android/external/armeabi-v7a/Makefile @@ -214,12 +214,8 @@ openssl/libssl.so: | openssl/Makefile PATH="$(ANDROID_NDK_HOME)/bin:$(PATH)" $(MAKE) -C openssl $(LOCAL)/lib/libssl.so: openssl/libssl.so - cd openssl && \ - cp libcrypto.so $(LOCAL)/lib && \ - cp libcrypto.a $(LOCAL)/lib && \ - cp libssl.so $(LOCAL)/lib && \ - cp libssl.a $(LOCAL)/lib - ls -l $(LOCAL)/lib/libssl.so + $(MAKE) -C openssl install + ls -l $(LOCAL)/lib openssl-build: openssl/libssl.so diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile index 7c93774..1e99f9f 100644 --- a/android/external/x86/Makefile +++ b/android/external/x86/Makefile @@ -209,12 +209,8 @@ openssl/libssl.so: | openssl/Makefile PATH="$(ANDROID_NDK_HOME)/bin:$(PATH)" $(MAKE) -C openssl $(LOCAL)/lib/libssl.so: openssl/libssl.so - cd openssl && \ - cp libcrypto.so $(LOCAL)/lib && \ - cp libcrypto.a $(LOCAL)/lib && \ - cp libssl.so $(LOCAL)/lib && \ - cp libssl.a $(LOCAL)/lib - ls -l $(LOCAL)/lib/libssl.so + $(MAKE) -C openssl install + ls -l $(LOCAL)/lib openssl-build: openssl/libssl.so diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile index 804fa1e..f43904d 100644 --- a/android/external/x86_64/Makefile +++ b/android/external/x86_64/Makefile @@ -209,11 +209,7 @@ openssl/libssl.so: | openssl/Makefile PATH="$(ANDROID_NDK_HOME)/bin:$(PATH)" $(MAKE) -C openssl $(LOCAL)/lib/libssl.so: openssl/libssl.so - cd openssl && \ - cp libcrypto.so $(LOCAL)/lib && \ - cp libcrypto.a $(LOCAL)/lib && \ - cp libssl.so $(LOCAL)/lib && \ - cp libssl.a $(LOCAL)/lib + $(MAKE) -C openssl install ls -l $(LOCAL)/lib openssl-build: openssl/libssl.so