Add support for x86_64 builds (#128)
Summary: Add the required compiler flag for Folly when building x86_64. I'll prepare a new release for this shortly. Depends on #126 Closes https://github.com/facebook/Sonar/pull/128 Reviewed By: danielbuechele Differential Revision: D8731955 Pulled By: priteshrnandgaonkar fbshipit-source-id: 9511811b0b51205989a5200ad9d0d8689ca684cb
This commit is contained in:
committed by
Facebook Github Bot
parent
ce33859d2d
commit
3dcf7722bb
@@ -211,7 +211,7 @@ android {
|
|||||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||||
|
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
|
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
||||||
}
|
}
|
||||||
|
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
|
|||||||
5
android/third-party/Folly/CMakeLists.txt
vendored
5
android/third-party/Folly/CMakeLists.txt
vendored
@@ -47,6 +47,11 @@ add_compile_options(
|
|||||||
-Wno-return-type
|
-Wno-return-type
|
||||||
-Wno-tautological-constant-compare
|
-Wno-tautological-constant-compare
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
|
||||||
|
add_compile_options(-mpclmul)
|
||||||
|
endif()
|
||||||
|
|
||||||
file(GLOB SRC_FILES ${FOLLY_DIR}/portability/*.cpp
|
file(GLOB SRC_FILES ${FOLLY_DIR}/portability/*.cpp
|
||||||
${FOLLY_DIR}/io/async/ssl/*.cpp
|
${FOLLY_DIR}/io/async/ssl/*.cpp
|
||||||
${FOLLY_DIR}/io/async/*.cpp
|
${FOLLY_DIR}/io/async/*.cpp
|
||||||
|
|||||||
Reference in New Issue
Block a user