Skip to content

Commit 3879526

Browse files
authored
Delete examples/llama.android/llama/CMakeLists.txt (#8165)
* 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
1 parent 6030c61 commit 3879526

File tree

2 files changed

+11
-62
lines changed

2 files changed

+11
-62
lines changed

examples/llama.android/llama/CMakeLists.txt

Lines changed: 0 additions & 55 deletions
This file was deleted.

examples/llama.android/llama/src/main/cpp/CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ cmake_minimum_required(VERSION 3.22.1)
1111
# build script scope).
1212
project("llama-android")
1313

14-
include(FetchContent)
15-
FetchContent_Declare(
16-
llama
17-
GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
18-
GIT_TAG master
19-
)
14+
#include(FetchContent)
15+
#FetchContent_Declare(
16+
# llama
17+
# GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
18+
# GIT_TAG master
19+
#)
2020

2121
# Also provides "common"
22-
FetchContent_MakeAvailable(llama)
22+
#FetchContent_MakeAvailable(llama)
2323

2424
# Creates and names a library, sets it as either STATIC
2525
# or SHARED, and provides the relative paths to its source code.
@@ -30,6 +30,10 @@ FetchContent_MakeAvailable(llama)
3030
# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
3131
# is preferred for the same purpose.
3232
#
33+
34+
#load local llama.cpp
35+
add_subdirectory(../../../../../../ build-llama)
36+
3337
# In order to load a library into your app from Java/Kotlin, you must call
3438
# System.loadLibrary() and pass the name of the library defined here;
3539
# for GameActivity/NativeActivity derived applications, the same library name must be

0 commit comments

Comments
 (0)