Summary: Follow up fix to pr#13526 (#13640)

Test Plan: CI

Reviewers:

Subscribers:

Tasks:

Tags:

### Summary
[PLEASE REMOVE] See [CONTRIBUTING.md's Pull
Requests](https://github.com/pytorch/executorch/blob/main/CONTRIBUTING.md#pull-requests)
for ExecuTorch PR guidelines.

[PLEASE REMOVE] If this PR closes an issue, please add a `Fixes
#<issue-id>` line.

[PLEASE REMOVE] If this PR introduces a fix or feature that should be
the upcoming release notes, please add a "Release notes: <area>" label.
For a list of available release notes labels, check out
[CONTRIBUTING.md's Pull
Requests](https://github.com/pytorch/executorch/blob/main/CONTRIBUTING.md#pull-requests).

### Test plan
[PLEASE REMOVE] How did you test this PR? Please write down any manual
commands you used and note down tests that you have written if
applicable.

Co-authored-by: Github Executorch <[email protected]>

Author: psiddh

extension/android/jni/BUCK

@@ -7,14 +7,6 @@ load(":build_defs.bzl", "ET_JNI_COMPILER_FLAGS")
 
 oncall("executorch")
 
-# Define the common JNI source files
-shared_srcs = [
-    "jni_layer.cpp",
-    "jni_layer_runtime.cpp",
-    "jni_helper.cpp",
-    "log.cpp",
-]
-
 non_fbcode_target(_kind = executorch_generated_lib,
     name = "generated_op_lib_optimized",
     custom_ops_aten_kernel_deps = [
@@ -36,7 +28,7 @@ non_fbcode_target(_kind = executorch_generated_lib,
 
 non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_jni",
-    srcs = shared_srcs,
+    srcs = ["jni_layer.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
     allow_jni_merging = False,
     compiler_flags = ET_JNI_COMPILER_FLAGS,
     soname = "libexecutorch.$(ext)",
@@ -57,7 +49,7 @@ non_fbcode_target(_kind = fb_android_cxx_library,
 
 non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_jni_full",
-    srcs = shared_srcs,
+    srcs = ["jni_layer.cpp", "log.cpp", "jni_layer_runtime.cpp", "jni_helper.cpp"],
     allow_jni_merging = False,
     compiler_flags = ET_JNI_COMPILER_FLAGS,
     soname = "libexecutorch.$(ext)",
@@ -79,7 +71,7 @@ non_fbcode_target(_kind = fb_android_cxx_library,
 
 non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_training_jni",
-    srcs = shared_srcs + ["jni_layer_training.cpp"],
+    srcs = ["jni_layer.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",
@@ -106,9 +98,12 @@ non_fbcode_target(_kind = fb_android_cxx_library,
 
 non_fbcode_target(_kind = fb_android_cxx_library,
     name = "executorch_llama_jni",
-    exclude_files = ["log.cpp"]
-    shared_srcs_filtered = [f for f in shared_srcs if f not in exclude_files]
-    srcs = shared_srcs_filtered + ["jni_layer_llama.cpp"]
+    srcs = [
+        "jni_layer.cpp",
+        "jni_layer_llama.cpp",
+        "jni_layer_runtime.cpp",
+        "jni_helper.cpp",
+    ],
     allow_jni_merging = False,
     compiler_flags = ET_JNI_COMPILER_FLAGS + [
         "-DEXECUTORCH_BUILD_LLAMA_JNI",
@@ -159,5 +154,6 @@ runtime.cxx_library(
     name = "jni_headers",
     exported_headers = [
         "jni_layer_constants.h",
+        "jni_helper.h",
     ]
 )

extension/android/jni/jni_layer.cpp

@@ -200,6 +200,7 @@ class JEValue : public facebook::jni::JavaClass<JEValue> {
     ss << "Unknown EValue type: [" << static_cast<int>(evalue.tag) << "]";
     jni_helper::throwExecutorchException(
         static_cast<uint32_t>(Error::InvalidArgument), ss.str().c_str());
+    return {};
   }
 
   static TensorPtr JEValueToTensorImpl(
@@ -219,6 +220,7 @@ class JEValue : public facebook::jni::JavaClass<JEValue> {
     ss << "Unknown EValue typeCode: " << typeCode;
     jni_helper::throwExecutorchException(
         static_cast<uint32_t>(Error::InvalidArgument), ss.str().c_str());
+    return {};
   }
 };