Page MenuHomePhabricator
Files F3345805

D5900.id19463.diff
No OneTemporary
Actions

D5900.id19463.diff
View Options

diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt
--- a/native/android/app/CMakeLists.txt
+++ b/native/android/app/CMakeLists.txt
@@ -39,7 +39,7 @@
elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86_64)
set(Rust_CARGO_TARGET x86_64-linux-android)
elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a)
- set(Rust_CARGO_TARGET arm-linux-androideabi)
+ set(Rust_CARGO_TARGET armv7-linux-androideabi)
endif()
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME_LOWER)
@@ -70,7 +70,16 @@
)
list(APPEND CMAKE_FIND_ROOT_PATH "${OPENSSL_ROOT_DIR}")
+# Override HAVE_EXECINFO_H in glog's CMakeLists.txt
+if(
+ CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR
+ CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a
+)
+ SET(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h")
+endif()
+
add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/)
+
add_subdirectory(../../node_modules/olm ./build)
set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules)
diff --git a/native/android/app/build.gradle b/native/android/app/build.gradle
--- a/native/android/app/build.gradle
+++ b/native/android/app/build.gradle
@@ -376,7 +376,6 @@
"aarch64-linux-android",
"armv7-linux-androideabi",
"i686-linux-android",
- "arm-linux-androideabi",
"x86_64-linux-android"
}
diff --git a/native/android/build.gradle b/native/android/build.gradle
--- a/native/android/build.gradle
+++ b/native/android/build.gradle
@@ -6,16 +6,13 @@
minSdkVersion = 21
compileSdkVersion = 31
targetSdkVersion = 31
- // We can't use NDK 24 yet because of Folly build issues
- // https://linear.app/comm/issue/ENG-2169/update-folly-on-android
- //if (System.properties['os.arch'] == "aarch64") {
- // // For M1 Users we need to use the NDK 24 which added support for aarch64
- // ndkVersion = "24.0.8215888"
- //} else {
- // // Otherwise we default to the side-by-side NDK version from AGP.
- // ndkVersion = "21.4.7075529"
- //}
- ndkVersion = "21.4.7075529"
+ if (System.properties['os.arch'] == "aarch64") {
+ // For M1 Users we need to use the NDK 24 which added support for aarch64
+ ndkVersion = "24.0.8215888"
+ } else {
+ // Otherwise we default to the side-by-side NDK version from AGP.
+ ndkVersion = "21.4.7075529"
+ }
}
repositories {
google()

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 7:06 AM (13 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2569546
Default Alt Text
D5900.id19463.diff (2 KB)

Event Timeline