jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link static libraries statically (#277)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/277

Link all dynamically loaded libraries statically with the exception of libevent.

Reviewed By: jknoxville

Differential Revision: D9967422

fbshipit-source-id: b33cec5da0c2b34f47217353f205b9d77f1acae2
This commit is contained in:
Pascal Hartig
2018-09-20 09:33:14 -07:00
committed by Facebook Github Bot
parent c0982ea1db
commit cc6f28f7c4
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/third-party/native.gradle vendored
View File

@@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
// Increment this when making changes to any of the native // Increment this when making changes to any of the native
// dependencies. // dependencies.
// !!! // !!!
final def CACHE_REVISION = 2 final def CACHE_REVISION = 3
final def externalDir = new File("$projectDir/external") final def externalDir = new File("$projectDir/external")
final def downloadsDir = new File("$buildDir/downloads") final def downloadsDir = new File("$buildDir/downloads")

2
android/third-party/overrides/DoubleConversion/CMakeLists.txt vendored
View File

@@ -6,6 +6,6 @@ set(PACKAGE_NAME doubleconversion)
set(doubleconversion_DIR double-conversion-3.0.0/double-conversion) set(doubleconversion_DIR double-conversion-3.0.0/double-conversion)
include_directories(${doubleconversion_DIR}) include_directories(${doubleconversion_DIR})
file(GLOB SRCFILES ${doubleconversion_DIR}/*.cc) file(GLOB SRCFILES ${doubleconversion_DIR}/*.cc)
add_library(${PACKAGE_NAME} SHARED ${SRCFILES}) add_library(${PACKAGE_NAME} STATIC ${SRCFILES})
install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/) install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
target_link_libraries(${PACKAGE_NAME}) target_link_libraries(${PACKAGE_NAME})

2
android/third-party/overrides/Folly/CMakeLists.txt vendored
View File

@@ -111,7 +111,7 @@ list(APPEND SRC_FILES ${FOLLY_DIR}/io/async/HHWheelTimer.cpp
${FOLLY_DIR}/memory/detail/MallocImpl.cpp ${FOLLY_DIR}/memory/detail/MallocImpl.cpp
) )
add_library(${PACKAGE_NAME} SHARED ${SRC_FILES}) add_library(${PACKAGE_NAME} STATIC ${SRC_FILES})
set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(build_DIR ${CMAKE_SOURCE_DIR}/build)

2
android/third-party/overrides/RSocket/CMakeLists.txt vendored
View File

@@ -61,7 +61,7 @@ add_compile_options(
-Wno-tautological-constant-compare -Wno-tautological-constant-compare
) )
add_library(${PACKAGE_NAME} SHARED ${SRC_FILES}) add_library(${PACKAGE_NAME} STATIC ${SRC_FILES})
set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(build_DIR ${CMAKE_SOURCE_DIR}/build)
set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI}) set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})

2
android/third-party/overrides/glog/CMakeLists.txt vendored
View File

@@ -39,6 +39,6 @@ list(APPEND src_files ${glog_DIR}/src/demangle.cc
${glog_DIR}/src/vlog_is_on.cc ${glog_DIR}/src/vlog_is_on.cc
) )
add_library(${PACKAGE_NAME} SHARED ${src_files}) add_library(${PACKAGE_NAME} STATIC ${src_files})
install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/) install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/)
target_link_libraries(${PACKAGE_NAME}) target_link_libraries(${PACKAGE_NAME})

2
xplat/CMakeLists.txt
View File

@@ -40,7 +40,7 @@ add_compile_options(-DFOLLY_NO_CONFIG
file(GLOB SOURCES Sonar/*.cpp) file(GLOB SOURCES Sonar/*.cpp)
add_library(${PACKAGE_NAME} SHARED ${SOURCES}) add_library(${PACKAGE_NAME} STATIC ${SOURCES})
set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(build_DIR ${CMAKE_SOURCE_DIR}/build)
set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI}) set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})