diff --git a/examples/.android-ssl-test/app.pro b/examples/.android-ssl-test/app.pro index 970de5a..76af848 100644 --- a/examples/.android-ssl-test/app.pro +++ b/examples/.android-ssl-test/app.pro @@ -75,8 +75,6 @@ android { ANDROID_EXTRA_LIBS += $$ECL/lib/libecl.so ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android - # can be downloaded from: - # https://github.com/KDAB/android_openssl/tree/master/latest 32bit { SSL_PATH = ../../../platforms/android/lib32 } else { diff --git a/examples/.android-ssl-test/make.lisp b/examples/.android-ssl-test/make.lisp index fabe425..95e76ca 100644 --- a/examples/.android-ssl-test/make.lisp +++ b/examples/.android-ssl-test/make.lisp @@ -28,6 +28,13 @@ (defun shell (command) (ext:run-program "sh" (list "-c" command))) +#+mobile +(unless (probe-file (cc *assets* "encodings")) + (let ((lib (cc (ext:getenv #+android "ECL_ANDROID" #+ios "ECL_IOS") + "/lib/ecl-*/"))) + (shell (cc "cp " lib "*.doc " *assets*)) + (shell (cc "cp -r " lib "encodings " *assets*)))) + ;;; compile ASDF system (require :asdf) diff --git a/examples/.android-ssl-test/platforms/android/assets/lib/.gitignore b/examples/.android-ssl-test/platforms/android/assets/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/examples/.android-ssl-test/platforms/android/assets/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/examples/.android-ssl-test/readme.md b/examples/.android-ssl-test/readme.md index 3522bfc..070c061 100644 --- a/examples/.android-ssl-test/readme.md +++ b/examples/.android-ssl-test/readme.md @@ -9,6 +9,10 @@ are present in directory ``` build-android/android-build/libs/arm64-v8a/ ``` +(that is, they should have been copied automatically to above place) + +Uninstall any app called 'app' (which you might have previously installed) +before installing this one. When running the app, it should first display "downloading...", and after a few seconds (if the android device is connected to the internet), it should display diff --git a/examples/cl-repl/app.pro b/examples/cl-repl/app.pro index 15b5692..9fe5f15 100644 --- a/examples/cl-repl/app.pro +++ b/examples/cl-repl/app.pro @@ -76,14 +76,12 @@ android { ANDROID_EXTRA_LIBS += $$ECL/lib/libecl.so ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android - # optional (not included), can be downloaded from: - # https://github.com/KDAB/android_openssl/tree/master/latest 32bit { SSL_PATH = ../../../platforms/android/lib32 } else { SSL_PATH = ../../../platforms/android/lib } - #ANDROID_EXTRA_LIBS += $$SSL_PATH/libcrypto.so $$SSL_PATH/libssl.so + ANDROID_EXTRA_LIBS += $$SSL_PATH/libcrypto.so $$SSL_PATH/libssl.so 32bit { ANDROID_ABIS = "armeabi-v7a" diff --git a/platforms/android/lib/libcrypto.so b/platforms/android/lib/libcrypto.so new file mode 100755 index 0000000..09d584f Binary files /dev/null and b/platforms/android/lib/libcrypto.so differ diff --git a/platforms/android/lib/libssl.so b/platforms/android/lib/libssl.so new file mode 100755 index 0000000..158d088 Binary files /dev/null and b/platforms/android/lib/libssl.so differ