From 92a927da29758462335825a7c4a0ce5524e48c29 Mon Sep 17 00:00:00 2001 From: mohammed-saalim Date: Wed, 11 Feb 2026 12:10:31 -0600 Subject: [PATCH] [Android] Rename JNI cpp files to improve name mapping Renamed JNI layer files to better align with their Java counterparts: - jni_layer.cpp -> jni_module.cpp - jni_layer_llama.cpp -> jni_llm_module.cpp Updated all references in build files (CMakeLists.txt, BUCK, selective_jni.buck.bzl) and comments to reflect the new names. Fixes #10890 --- extension/android/CMakeLists.txt | 4 ++-- extension/android/jni/BUCK | 10 +++++----- extension/android/jni/jni_layer_training.cpp | 2 +- .../jni/{jni_layer_llama.cpp => jni_llm_module.cpp} | 0 .../android/jni/{jni_layer.cpp => jni_module.cpp} | 0 extension/android/jni/selective_jni.buck.bzl | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename extension/android/jni/{jni_layer_llama.cpp => jni_llm_module.cpp} (100%) rename extension/android/jni/{jni_layer.cpp => jni_module.cpp} (100%) diff --git a/extension/android/CMakeLists.txt b/extension/android/CMakeLists.txt index f6c1bc2a041..dd5399eb7d8 100644 --- a/extension/android/CMakeLists.txt +++ b/extension/android/CMakeLists.txt @@ -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 ) @@ -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) diff --git a/extension/android/jni/BUCK b/extension/android/jni/BUCK index 1b3e63002f8..1b4010b4ea3 100644 --- a/extension/android/jni/BUCK +++ b/extension/android/jni/BUCK @@ -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)", @@ -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)", @@ -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", @@ -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", @@ -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( diff --git a/extension/android/jni/jni_layer_training.cpp b/extension/android/jni/jni_layer_training.cpp index 5a5e9f24d2f..c04c4b066fa 100644 --- a/extension/android/jni/jni_layer_training.cpp +++ b/extension/android/jni/jni_layer_training.cpp @@ -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 { public: constexpr static const char* kJavaDescriptor = diff --git a/extension/android/jni/jni_layer_llama.cpp b/extension/android/jni/jni_llm_module.cpp similarity index 100% rename from extension/android/jni/jni_layer_llama.cpp rename to extension/android/jni/jni_llm_module.cpp diff --git a/extension/android/jni/jni_layer.cpp b/extension/android/jni/jni_module.cpp similarity index 100% rename from extension/android/jni/jni_layer.cpp rename to extension/android/jni/jni_module.cpp diff --git a/extension/android/jni/selective_jni.buck.bzl b/extension/android/jni/selective_jni.buck.bzl index 8e20f903ca9..3580246bf95 100644 --- a/extension/android/jni/selective_jni.buck.bzl +++ b/extension/android/jni/selective_jni.buck.bzl @@ -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,