diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt index 73d2dd0d..227f493f 100644 --- a/android/app/src/main/cpp/CMakeLists.txt +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -22,14 +22,6 @@ set_target_properties(crypto-lib PROPERTIES IMPORTED_LOCATION ${lib_src_DIR}/lib/libcrypto.a) -add_library(ssh-lib - STATIC - IMPORTED) - -set_target_properties(ssh-lib - PROPERTIES IMPORTED_LOCATION - ${lib_src_DIR}/lib/libssh.a) - add_library(ssh2-lib STATIC IMPORTED) @@ -55,4 +47,4 @@ add_library(native-lib # The order of these libraries is super dooper important # Otherwise you'll get linker errors -target_link_libraries(native-lib git2-lib ssh2-lib ssh-lib openssl-lib crypto-lib android log) +target_link_libraries(native-lib git2-lib ssh2-lib openssl-lib crypto-lib android log) diff --git a/gj_common/Makefile b/gj_common/Makefile index d1adfbfc..cf2a891f 100644 --- a/gj_common/Makefile +++ b/gj_common/Makefile @@ -1,4 +1,4 @@ CC=clang test: gitjournal.c test.c keygen.c - $(CC) -o test -g test.c gitjournal.c keygen.c -lgit2 -lssh + $(CC) -o test -g test.c gitjournal.c keygen.c -lgit2 diff --git a/gj_common/keygen.c b/gj_common/keygen.c index 8ea227ca..7e4ffaa6 100644 --- a/gj_common/keygen.c +++ b/gj_common/keygen.c @@ -4,9 +4,10 @@ #include #include -#include +/* #include #include +*/ void change_pubickey_comment(const char *filename, const char *comment) { @@ -40,6 +41,8 @@ void gj_ssh_log_callback(int priority, const char *function, const char *buffer, int gj_generate_ssh_keys(const char *private_key_path, const char *public_key_path, const char *comment) { + return 1; + /* ssh_key key; int err; @@ -79,4 +82,5 @@ int gj_generate_ssh_keys(const char *private_key_path, chmod(private_key_path, modeInt); return 0; + */ }