diff --git a/manager/app/src/main/cpp/CMakeLists.txt b/manager/app/src/main/cpp/CMakeLists.txt index 25682735..12a2b284 100644 --- a/manager/app/src/main/cpp/CMakeLists.txt +++ b/manager/app/src/main/cpp/CMakeLists.txt @@ -15,11 +15,11 @@ add_library(zako find_library(log-lib log) if(ANDROID_ABI STREQUAL "arm64-v8a") - set(zakosign-lib ${CMAKE_SOURCE_DIR}/libs/arm64-v8a/libzakosign.so) + set(zakosign-lib ${CMAKE_SOURCE_DIR}/../jniLibs/arm64-v8a/libzakosign.so) endif() if(ANDROID_ABI STREQUAL "arm64-v8a") target_link_libraries(zako ${log-lib} ${zakosign-lib}) -else () +else() target_link_libraries(zako ${log-lib}) -endif () +endif() diff --git a/manager/app/src/main/cpp/ksu.c b/manager/app/src/main/cpp/ksu.c index 41aa3854..926a9748 100644 --- a/manager/app/src/main/cpp/ksu.c +++ b/manager/app/src/main/cpp/ksu.c @@ -15,7 +15,7 @@ // Zako extern declarations #define ZAKO_ESV_IMPORTANT_ERROR 1 << 31 -extern int zako_file_open_rw(const char* path); +extern int zako_sys_file_open(const char* path); extern uint32_t zako_file_verify_esig(int fd, uint32_t flags); extern const char* zako_esign_verrcidx2str(uint8_t index); @@ -201,7 +201,7 @@ bool verify_module_signature(const char* input) { return false; } - int fd = zako_file_open_rw(input); + int fd = zako_sys_file_open(input); if (fd < 0) { LogDebug("verify_module_signature: failed to open file: %s", input); return false; diff --git a/manager/app/src/main/cpp/libs/arm64-v8a/libzakosign.so b/manager/app/src/main/cpp/libs/arm64-v8a/libzakosign.so deleted file mode 100644 index 05904903..00000000 Binary files a/manager/app/src/main/cpp/libs/arm64-v8a/libzakosign.so and /dev/null differ diff --git a/manager/app/src/main/jniLibs/arm64-v8a/libzakosign.so b/manager/app/src/main/jniLibs/arm64-v8a/libzakosign.so index 05904903..04b5e1e6 100644 Binary files a/manager/app/src/main/jniLibs/arm64-v8a/libzakosign.so and b/manager/app/src/main/jniLibs/arm64-v8a/libzakosign.so differ