add a way to build non llm

Author: kirklandsign

build/build_android_llm_demo.sh

@@ -97,14 +97,13 @@ build_aar() {
   find jni -type f -name "libexecutorch_jni.so" -exec bash -c 'mv "$1" "${1/_jni/}"' bash {} \;
   # Zip all necessary files into the AAR file
   zip -r executorch.aar libs jni/*/libexecutorch.so jni/*/libqnn*.so jni/*/libQnn*.so AndroidManifest.xml
-  zip -r executorch-llama.aar libs jni/*/libexecutorch_llama_jni.so jni/*/libqnn*.so jni/*/libQnn*.so AndroidManifest.xml
+  zip -r executorch-llama.aar libs jni/*/libexecutorch.so jni/*/libqnn*.so jni/*/libQnn*.so AndroidManifest.xml
   popd
 }
 
 build_android_demo_apps() {
   mkdir -p examples/demo-apps/android/LlamaDemo/app/libs
   cp ${BUILD_AAR_DIR}/executorch-llama.aar examples/demo-apps/android/LlamaDemo/app/libs
-  cp ${BUILD_AAR_DIR}/executorch-llama.aar extension/android/benchmark/app/libs/executorch.aar
   pushd examples/demo-apps/android/LlamaDemo
   ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
   popd
@@ -140,6 +139,7 @@ collect_artifacts_to_be_uploaded() {
 }
 
 BUILD_AAR_DIR="$(mktemp -d)"
+export BUILD_AAR_DIR
 if [ -z "$ANDROID_ABIS" ]; then
   ANDROID_ABIS=("arm64-v8a" "x86_64")
 fi

extension/android/CMakeLists.txt

@@ -78,11 +78,12 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
   )
 endif()
 
-set(JNI_SRCS jni/jni_layer.cpp)
+add_library(executorch_jni SHARED jni/jni_layer.cpp)
 
 if(EXECUTORCH_BUILD_LLAMA_JNI)
-  list(APPEND JNI_SRCS jni/jni_layer_llama.cpp)
+  target_sources(executorch_jni PRIVATE jni/jni_layer_llama.cpp)
   list(APPEND link_libraries llama_runner llava_runner)
+  target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_LLAMA_JNI=1)
   add_subdirectory(
     ${EXECUTORCH_ROOT}/examples/models/llava/runner
     ${CMAKE_CURRENT_BINARY_DIR}/../../examples/models/llava/runner
@@ -98,8 +99,6 @@ if(TARGET quantized_kernels)
   list(APPEND link_libraries quantized_kernels quantized_ops_lib)
 endif()
 
-add_library(executorch_jni SHARED ${JNI_SRCS})
-
 target_include_directories(
   executorch_jni PRIVATE ${_common_include_directories}
 )

extension/android/jni/jni_layer.cpp

@@ -386,11 +386,15 @@ class ExecuTorchJni : public facebook::jni::HybridClass<ExecuTorchJni> {
 };
 } // namespace executorch::extension
 
-extern void register_natives_jni();
-
+#ifdef EXECUTORCH_BUILD_LLAMA_JNI
+extern void register_natives_for_llama();
+#else
+// No op if we don't build llama
+void register_natives_for_llama() {}
+#endif
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
   return facebook::jni::initialize(
       vm, [] { executorch::extension::ExecuTorchJni::registerNatives();
-     register_natives_jni();
+     register_natives_for_llama();
  });
 }

extension/android/jni/jni_layer_llama.cpp

@@ -265,7 +265,6 @@ class ExecuTorchLlamaJni
 
 } // namespace executorch_jni
 
-void register_natives_jni() {
+void register_natives_for_llama() {
 	executorch_jni::ExecuTorchLlamaJni::registerNatives();
 }
-