From 4d993d97ec331d25dbe653cad64d0b82c7b42c38 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Mon, 3 Jun 2024 11:21:26 -0700 Subject: [PATCH 1/3] [Android] Rename so file to match soname --- build/test_android_ci.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/test_android_ci.sh b/build/test_android_ci.sh index b1f17730f5d..1ae26872891 100755 --- a/build/test_android_ci.sh +++ b/build/test_android_ci.sh @@ -45,9 +45,11 @@ build_aar() { \ \ \ > build_aar/AndroidManifest.xml pushd build_aar + mv jni/arm64-v8a/libexecutorch_jni.so jni/arm64-v8a/libexecutorch.so + mv jni/x86_64/libexecutorch_jni.so jni/x86_64/libexecutorch.so zip -r executorch.aar libs jni AndroidManifest.xml - rm jni/arm64-v8a/libexecutorch_jni.so jni/x86_64/libexecutorch_jni.so + rm jni/arm64-v8a/libexecutorch.so jni/x86_64/libexecutorch.so zip -r executorch-llama.aar libs jni AndroidManifest.xml popd } From 1f792066e96ec5ce1281e9cd81d10e349272b800 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Mon, 3 Jun 2024 12:30:00 -0700 Subject: [PATCH 2/3] test --- extension/android/jni/jni_layer_llama.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/extension/android/jni/jni_layer_llama.cpp b/extension/android/jni/jni_layer_llama.cpp index b4fe80f0225..1601b9acf12 100644 --- a/extension/android/jni/jni_layer_llama.cpp +++ b/extension/android/jni/jni_layer_llama.cpp @@ -41,6 +41,7 @@ void et_pal_emit_log_message( const char* message, size_t length) { int android_log_level = ANDROID_LOG_UNKNOWN; + if (level == 'D') { android_log_level = ANDROID_LOG_DEBUG; } else if (level == 'I') { From 17a94362ada44c4cc5bb70ff928d1aa515753940 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Mon, 3 Jun 2024 13:00:52 -0700 Subject: [PATCH 3/3] clean up --- extension/android/jni/jni_layer_llama.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/extension/android/jni/jni_layer_llama.cpp b/extension/android/jni/jni_layer_llama.cpp index 1601b9acf12..b4fe80f0225 100644 --- a/extension/android/jni/jni_layer_llama.cpp +++ b/extension/android/jni/jni_layer_llama.cpp @@ -41,7 +41,6 @@ void et_pal_emit_log_message( const char* message, size_t length) { int android_log_level = ANDROID_LOG_UNKNOWN; - if (level == 'D') { android_log_level = ANDROID_LOG_DEBUG; } else if (level == 'I') {