Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
ndk {
abiFilters += listOf("arm64-v8a" /*, "x86_64" */)
abiFilters += listOf("arm64-v8a", "x86_64")
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE on)
set(FFMPEG_VERSION 5.1)
set(LLVM_VERSION 19.1)

if (TEST_OVERRIDE_CPU)
# workaround to enable x86_64 Android Emulator compatibility
if (ANDROID AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
set(ARCH_FLAGS "-mcpu=cortex-a53")
else()
Expand Down