Skip to content

Rename jni layer cpp files #17380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mohammed-saalim wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −9
Open

Rename jni layer cpp files #17380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92a927d
[Android] Rename JNI cpp files to improve name mapping
mohammed-saalim Feb 11, 2026
c1de60a
Merge branch 'main' into rename-jni-layer-cpp-files
mohammed-saalim Feb 11, 2026
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
4 changes: 2 additions & 2 deletions extension/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ set_target_properties(
executorch_target_link_options_shared_lib(executorch)

add_library(
executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp
executorch_jni SHARED jni/jni_module.cpp jni/log.cpp jni/jni_layer_runtime.cpp
jni/jni_helper.cpp
)

Expand Down Expand Up @@ -171,7 +171,7 @@ endif()

if(EXECUTORCH_BUILD_LLAMA_JNI)
target_sources(
executorch_jni PRIVATE jni/jni_layer_llama.cpp jni/jni_layer_asr.cpp
executorch_jni PRIVATE jni/jni_llm_module.cpp jni/jni_layer_asr.cpp
jni/log.cpp
)
list(APPEND link_libraries extension_llm_runner extension_asr_runner)
Expand Down
10 changes: 5 additions & 5 deletions extension/android/jni/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ non_fbcode_target(_kind = executorch_generated_lib,

non_fbcode_target(_kind = fb_android_cxx_library,
name = "executorch_jni",
srcs = ["jni_layer.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
srcs = ["jni_module.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
allow_jni_merging = False,
compiler_flags = ET_JNI_COMPILER_FLAGS,
soname = "libexecutorch.$(ext)",
Expand All @@ -49,7 +49,7 @@ non_fbcode_target(_kind = fb_android_cxx_library,

non_fbcode_target(_kind = fb_android_cxx_library,
name = "executorch_jni_full",
srcs = ["jni_layer.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
srcs = ["jni_module.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
allow_jni_merging = False,
compiler_flags = ET_JNI_COMPILER_FLAGS,
soname = "libexecutorch.$(ext)",
Expand All @@ -73,7 +73,7 @@ non_fbcode_target(_kind = fb_android_cxx_library,

non_fbcode_target(_kind = fb_android_cxx_library,
name = "executorch_training_jni",
srcs = ["jni_layer.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_layer_training.cpp", "jni_helper.cpp"],
srcs = ["jni_module.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_layer_training.cpp", "jni_helper.cpp"],
allow_jni_merging = False,
compiler_flags = ET_JNI_COMPILER_FLAGS + [
"-DEXECUTORCH_BUILD_EXTENSION_TRAINING",
Expand All @@ -100,7 +100,7 @@ non_fbcode_target(_kind = fb_android_cxx_library,

non_fbcode_target(_kind = fb_android_cxx_library,
name = "executorch_llama_jni",
srcs = ["jni_layer.cpp", "jni_layer_llama.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
srcs = ["jni_module.cpp", "jni_llm_module.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
allow_jni_merging = False,
compiler_flags = ET_JNI_COMPILER_FLAGS + [
"-DEXECUTORCH_BUILD_LLAMA_JNI",
Expand Down Expand Up @@ -135,7 +135,7 @@ non_fbcode_target(_kind = runtime.cxx_library,
)

runtime.export_file(
name = "jni_layer.cpp",
name = "jni_module.cpp",
)

runtime.export_file(
Expand Down
2 changes: 1 addition & 1 deletion extension/android/jni/jni_layer_training.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ using namespace torch::executor;

namespace executorch::extension {

// Forward declarations from jni_layer.cpp
// Forward declarations from jni_module.cpp
class TensorHybrid : public facebook::jni::HybridClass<TensorHybrid> {
public:
constexpr static const char* kJavaDescriptor =
Expand Down
0 extension/android/jni/jni_layer_llama.cpp → extension/android/jni/jni_llm_module.cpp
View file
Open in desktop
File renamed without changes.
0 extension/android/jni/jni_layer.cpp → extension/android/jni/jni_module.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion extension/android/jni/selective_jni.buck.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def selective_jni_target(name, deps, srcs = [], soname = "libexecutorch.$(ext)")
_kind = fb_android_cxx_library,
name = name,
srcs = [
"//xplat/executorch/extension/android/jni:jni_layer.cpp",
"//xplat/executorch/extension/android/jni:jni_module.cpp",
"//xplat/executorch/extension/android/jni:jni_layer_runtime.cpp",
"//xplat/executorch/extension/android/jni:jni_helper.cpp",
] + srcs,
Expand Down
Loading