Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
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 .ci/scripts/build_llama_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install_executorch_and_backend_lib() {
echo "Installing executorch and xnnpack backend"
clean_executorch_install_folders
mkdir cmake-android-out
ANDROID_NDK=/opt/ndk
ANDROID_NDK=${ANDROID_NDK:-/opt/ndk}
BUCK2=buck2
ANDROID_ABI=arm64-v8a
cmake --preset llm \
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ endif()

if(EXECUTORCH_BUILD_TESTS)
include(CTest)
else()
# It looks like some of our third-party deps will try to turn this on if it's
# not explicitly set, leading to confusing behavior.
set(BUILD_TESTING OFF)
endif()

add_subdirectory(third-party)
Expand Down Expand Up @@ -737,7 +741,10 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
endif()

set(CMAKE_EXECUTABLE_SUFFIX ".html")
target_link_options(executor_runner PUBLIC -sALLOW_MEMORY_GROWTH --embed-file "${WASM_MODEL_DIR}@/")
target_link_options(
executor_runner PUBLIC -sALLOW_MEMORY_GROWTH --embed-file
"${WASM_MODEL_DIR}@/"
)
endif()
endif()

Expand Down
Loading