Browse Source

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-build-178
Hussein Kasem 3 years ago
parent
commit
de48de6ba1
No known key found for this signature in database GPG Key ID: 9E61B9BC790E6B02
  1. 8
      android/external/arm64-v8a/Makefile
  2. 8
      android/external/armeabi-v7a/Makefile
  3. 8
      android/external/x86/Makefile
  4. 6
      android/external/x86_64/Makefile

8
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

8
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

8
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

6
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

Loading…
Cancel
Save