diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index 36b679eda44..fa7c331311f 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -29,7 +29,7 @@ jobs: export ARTIFACTS_DIR_NAME=artifacts-to-be-uploaded # Build LLM Demo for Android - bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} + bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME} # Running Android emulator directly on the runner and not using Docker run-emulator: diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index 8bebc7be1bc..201fb3b7a8f 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -363,7 +363,7 @@ jobs: PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh export ANDROID_ABIS="arm64-v8a" - PYTHON_EXECUTABLE=python EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029 bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} + PYTHON_EXECUTABLE=python EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029 bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME} # Let's see how expensive this job is, we might want to tone it down by running it periodically benchmark-on-device: diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml index d204e121ffa..8d2c1d354cc 100644 --- a/.github/workflows/android-release-artifacts.yml +++ b/.github/workflows/android-release-artifacts.yml @@ -53,7 +53,7 @@ jobs: export ARTIFACTS_DIR_NAME=artifacts-to-be-uploaded # Build LLM Demo for Android - bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME} + bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME} shasum -a 256 "${ARTIFACTS_DIR_NAME}/llm_demo/executorch.aar" diff --git a/build/build_android_llm_demo.sh b/build/build_android_library.sh similarity index 100% rename from build/build_android_llm_demo.sh rename to build/build_android_library.sh diff --git a/examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md b/examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md index 6351640dcc0..34d52dd4e04 100644 --- a/examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md +++ b/examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md @@ -123,7 +123,7 @@ The Mediatek runner (`examples/mediatek/executor_runner/mtk_llama_runner.cpp`) c Next we need to build and compile the MediaTek backend and MediaTek Llama runner. By setting `NEURON_BUFFER_ALLOCATOR_LIB`, the script will build the MediaTek backend. ``` -sh build/build_android_llm_demo.sh +sh build/build_android_library.sh ``` **Output**: This will generate an .aar file that is already imported into the expected directory for the Android app. It will live in `examples/demo-apps/android/Llamademo/app/libs`. diff --git a/examples/demo-apps/android/LlamaDemo/setup-with-qnn.sh b/examples/demo-apps/android/LlamaDemo/setup-with-qnn.sh index 044d80832de..1d251de9ef3 100644 --- a/examples/demo-apps/android/LlamaDemo/setup-with-qnn.sh +++ b/examples/demo-apps/android/LlamaDemo/setup-with-qnn.sh @@ -13,7 +13,7 @@ if [ -z "$QNN_SDK_ROOT" ]; then fi BASEDIR=$(dirname "$0") -source "$BASEDIR"/../../../../build/build_android_llm_demo.sh +source "$BASEDIR"/../../../../build/build_android_library.sh BUILD_AAR_DIR="$(mktemp -d)" export BUILD_AAR_DIR diff --git a/examples/demo-apps/android/LlamaDemo/setup.sh b/examples/demo-apps/android/LlamaDemo/setup.sh index 4d70c67ede0..ec626c289b5 100644 --- a/examples/demo-apps/android/LlamaDemo/setup.sh +++ b/examples/demo-apps/android/LlamaDemo/setup.sh @@ -8,7 +8,7 @@ set -eu BASEDIR=$(dirname "$0") -source "$BASEDIR"/../../../../build/build_android_llm_demo.sh +source "$BASEDIR"/../../../../build/build_android_library.sh BUILD_AAR_DIR="$(mktemp -d)" export BUILD_AAR_DIR diff --git a/extension/android_test/setup.sh b/extension/android_test/setup.sh index c21d2c09623..e1306af4205 100755 --- a/extension/android_test/setup.sh +++ b/extension/android_test/setup.sh @@ -11,7 +11,7 @@ BUILD_AAR_DIR="$(mktemp -d)" export BUILD_AAR_DIR BASEDIR=$(dirname "$0") -source "$BASEDIR"/../../build/build_android_llm_demo.sh +source "$BASEDIR"/../../build/build_android_library.sh build_native_library() { ANDROID_ABI="$1" diff --git a/extension/benchmark/android/benchmark/README.md b/extension/benchmark/android/benchmark/README.md index cfc5ef0e594..9aba211b42b 100644 --- a/extension/benchmark/android/benchmark/README.md +++ b/extension/benchmark/android/benchmark/README.md @@ -15,7 +15,7 @@ Minibench is usedful for giving reference performance data when developers integ You will need executorch AAR for Java and JNI dependencies. ``` export ANDROID_NDK= -sh build/build_android_llm_demo.sh +sh build/build_android_library.sh ``` and copy the AAR to `app/libs`. ```