Skip to content

Commit

Permalink
Delete examples/llama.android/llama/CMakeLists.txt (#8165)
Browse files Browse the repository at this point in the history
* Delete examples/llama.android/llama/CMakeLists.txt

#8145 (comment)

This file is not being used for building on Android. `llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt` is being used instead.

* Update CMakeLists.txt

Pick local llama.cpp files instead of fetching content from git
  • Loading branch information
criminact authored Jun 27, 2024
1 parent 6030c61 commit 3879526
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 62 deletions.
55 changes: 0 additions & 55 deletions examples/llama.android/llama/CMakeLists.txt

This file was deleted.

18 changes: 11 additions & 7 deletions examples/llama.android/llama/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ cmake_minimum_required(VERSION 3.22.1)
# build script scope).
project("llama-android")

include(FetchContent)
FetchContent_Declare(
llama
GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
GIT_TAG master
)
#include(FetchContent)
#FetchContent_Declare(
# llama
# GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
# GIT_TAG master
#)

# Also provides "common"
FetchContent_MakeAvailable(llama)
#FetchContent_MakeAvailable(llama)

# Creates and names a library, sets it as either STATIC
# or SHARED, and provides the relative paths to its source code.
Expand All @@ -30,6 +30,10 @@ FetchContent_MakeAvailable(llama)
# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
# is preferred for the same purpose.
#

#load local llama.cpp
add_subdirectory(../../../../../../ build-llama)

# In order to load a library into your app from Java/Kotlin, you must call
# System.loadLibrary() and pass the name of the library defined here;
# for GameActivity/NativeActivity derived applications, the same library name must be
Expand Down

0 comments on commit 3879526

Please sign in to comment.