[WIP] gradle builds but app freezes, updated fbjni so file is the possible culprit
This commit is contained in:
@@ -6,7 +6,6 @@ set(PACKAGE_NAME doubleconversion)
|
||||
set(doubleconversion_DIR double-conversion-3.0.0/double-conversion)
|
||||
include_directories(${doubleconversion_DIR})
|
||||
file(GLOB SRCFILES ${doubleconversion_DIR}/*.cc)
|
||||
message(STATUS "SRC FILES :- " ${SRCFILES})
|
||||
add_library(${PACKAGE_NAME} SHARED ${SRCFILES})
|
||||
install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
|
||||
target_link_libraries(${PACKAGE_NAME})
|
||||
|
||||
2
android/third-party/Folly/CMakeLists.txt
vendored
2
android/third-party/Folly/CMakeLists.txt
vendored
@@ -106,7 +106,6 @@ list(APPEND SRC_FILES ${FOLLY_DIR}/io/async/HHWheelTimer.cpp
|
||||
${FOLLY_DIR}/memory/detail/MallocImpl.cpp
|
||||
)
|
||||
|
||||
message(STATUS "SRC FILES:- " ${SRC_FILES})
|
||||
add_library(${PACKAGE_NAME} SHARED ${SRC_FILES})
|
||||
|
||||
set(build_DIR ${CMAKE_SOURCE_DIR}/build)
|
||||
@@ -135,7 +134,6 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
|
||||
set(LIBEXTRA_PATH /Users/prit91/LocalDevTesting/sonar-upstream-proper/Sonar/android/build/third-party-ndk/LibEvent/.externalNativeBuild/cmake/debug/${ANDROID_ABI}/lib)
|
||||
set(OPENSSL_LINK_DIRECTORIES ${PROJECT_SOURCE_DIR}/../OpenSSL/libs/${ANDROID_ABI}/)
|
||||
find_path(OPENSSL_LIBRARY libssl.so HINTS ${OPENSSL_LINK_DIRECTORIES})
|
||||
message(STATUS "link_directories:- " ${LIBEVENT_LINK_DIRECTORIES})
|
||||
|
||||
install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
|
||||
|
||||
|
||||
4
android/third-party/Folly/build.gradle
vendored
4
android/third-party/Folly/build.gradle
vendored
@@ -9,7 +9,7 @@ android {
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||
ndk {
|
||||
abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a', 'armeabi'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
@@ -40,5 +40,3 @@ android {
|
||||
|
||||
}
|
||||
}
|
||||
// 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
||||
//'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
|
||||
1
android/third-party/LibEvent/CMakeLists.txt
vendored
1
android/third-party/LibEvent/CMakeLists.txt
vendored
@@ -32,7 +32,6 @@ list(APPEND SRCFILES ${LIBEVENT_DIR}/event.c
|
||||
${LIBEVENT_DIR}/strlcpy.c
|
||||
)
|
||||
|
||||
message(STATUS "DIR_LIST :- " ${DIR_LIST})
|
||||
add_library(${PACKAGE_NAME} SHARED ${SRCFILES})
|
||||
install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
|
||||
target_link_libraries(${PACKAGE_NAME})
|
||||
|
||||
3
android/third-party/LibEvent/build.gradle
vendored
3
android/third-party/LibEvent/build.gradle
vendored
@@ -8,7 +8,7 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a', 'armeabi'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
@@ -31,4 +31,3 @@ android {
|
||||
}
|
||||
}
|
||||
}
|
||||
//'x86', 'x86_64', 'armeabi-v7a',
|
||||
|
||||
2
android/third-party/OpenSSL/build.gradle
vendored
2
android/third-party/OpenSSL/build.gradle
vendored
@@ -8,7 +8,7 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a', 'armeabi'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
|
||||
5
android/third-party/RSocket/CMakeLists.txt
vendored
5
android/third-party/RSocket/CMakeLists.txt
vendored
@@ -18,7 +18,6 @@ set(RSOCKET_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-0.10.1/rsocket)
|
||||
|
||||
list(APPEND dir_list ${RSOCKET_ROOT_DIR}/)
|
||||
list(APPEND dir_list ${RSOCKET_DIR}/)
|
||||
#list(APPEND dir_list ${RSOCKET_DIR}/benchmarks)
|
||||
list(APPEND dir_list ${RSOCKET_DIR}/framing)
|
||||
list(APPEND dir_list ${RSOCKET_DIR}/internal)
|
||||
list(APPEND dir_list ${RSOCKET_DIR}/statemachine)
|
||||
@@ -29,7 +28,6 @@ list(APPEND dir_list ${RSOCKET_ROOT_DIR}/yarpl/observable)
|
||||
list(APPEND dir_list ${RSOCKET_ROOT_DIR}/yarpl/utils)
|
||||
|
||||
file(GLOB SRC_FILES ${RSOCKET_DIR}/*.cpp
|
||||
# ${RSOCKET_DIR}/benchmarks/*.cpp
|
||||
${RSOCKET_DIR}/internal/*.cpp
|
||||
${RSOCKET_DIR}/framing/*.cpp
|
||||
${RSOCKET_DIR}/statemachine/*.cpp
|
||||
@@ -62,8 +60,6 @@ add_compile_options(
|
||||
-Wno-tautological-constant-compare
|
||||
)
|
||||
|
||||
#file(GLOB_RECURSE SRCFILES ${RSOCKET_DIR}/*.cpp)
|
||||
|
||||
add_library(${PACKAGE_NAME} SHARED ${SRC_FILES})
|
||||
|
||||
set(build_DIR ${CMAKE_SOURCE_DIR}/build)
|
||||
@@ -89,7 +85,6 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
|
||||
)
|
||||
|
||||
|
||||
#install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
|
||||
set(OPENSSL_LINK_DIRECTORIES ${third_party_ndk}/OpenSSL/libs/${ANDROID_ABI}/)
|
||||
|
||||
find_path(OPENSSL_LIBRARY libssl.so HINTS ${OPENSSL_LINK_DIRECTORIES})
|
||||
|
||||
1
android/third-party/glog/CMakeLists.txt
vendored
1
android/third-party/glog/CMakeLists.txt
vendored
@@ -13,7 +13,6 @@ list(APPEND dir_list ${glog_DIR}/src)
|
||||
list(APPEND dir_list ${glog_DIR}/glog)
|
||||
list(APPEND dir_list ${glog_DIR}/base)
|
||||
|
||||
message(STATUS "dir_list = " ${dir_list})
|
||||
include_directories(${dir_list})
|
||||
|
||||
add_compile_options(
|
||||
|
||||
Reference in New Issue
Block a user