Skip to content

Commit 5fb695a

Browse files
committed
fix: android build
1 parent a336c28 commit 5fb695a

2 files changed

Lines changed: 6 additions & 28 deletions

File tree

android/CMakeLists.txt

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,15 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/RNZano+autolinking.cma
2222
include_directories(
2323
"src/main/cpp"
2424
"../cpp"
25-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/include
26-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/openssl/include
27-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/include
25+
${CMAKE_SOURCE_DIR}/../libraries/include
2826
)
2927

3028
find_library(LOG_LIB log)
3129

32-
link_directories(
33-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib
34-
)
35-
3630
# Link all libraries together
3731
target_link_libraries(
38-
${PACKAGE_NAME}
39-
${LOG_LIB}
40-
android # <-- Android core
41-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_thread.a
42-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_system.a
43-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_filesystem.a
44-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_timer.a
45-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_date_time.a
46-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_chrono.a
47-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_regex.a
48-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_serialization.a
49-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_atomic.a
50-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/boost/${ANDROID_ABI}/lib/libboost_program_options.a
51-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/openssl/${ANDROID_ABI}/lib/libssl.a
52-
${CMAKE_SOURCE_DIR}/../libraries/_libs_android/openssl/${ANDROID_ABI}/lib/libcrypto.a
53-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/${ANDROID_ABI}/lib/libcurrency_core.a
54-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/${ANDROID_ABI}/lib/libcommon.a
55-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/${ANDROID_ABI}/lib/libcrypto.a
56-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/${ANDROID_ABI}/lib/libz.a
57-
${CMAKE_SOURCE_DIR}/../libraries/_install_android/${ANDROID_ABI}/lib/libwallet.a
32+
${PACKAGE_NAME}
33+
${LOG_LIB}
34+
android
35+
${CMAKE_SOURCE_DIR}/../libraries/lib/libzano-android-${ANDROID_ABI}.a
5836
)

0 commit comments

Comments
 (0)