Skip to content

Commit 1fd137a

Browse files
committed
move build_android_library
1 parent a8ea5fa commit 1fd137a

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

.github/workflows/_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
3131
# Build LLM Demo for Android
3232
export BUILD_AAR_DIR=aar-out
33-
bash build/build_android_library.sh ${ARTIFACTS_DIR_NAME}
33+
bash scripts/build_android_library.sh ${ARTIFACTS_DIR_NAME}
3434
bash .ci/scripts/build_android_instrumentation.sh ${ARTIFACTS_DIR_NAME}
3535
3636
mkdir -p ${ARTIFACTS_DIR_NAME}/fp32-xnnpack-custom

.github/workflows/android-perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ jobs:
363363
PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
364364
365365
mkdir -p aar-out
366-
PYTHON_EXECUTABLE=python ANDROID_ABIS="arm64-v8a" BUILD_AAR_DIR=aar-out EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029 bash build/build_android_library.sh
366+
PYTHON_EXECUTABLE=python ANDROID_ABIS="arm64-v8a" BUILD_AAR_DIR=aar-out EXECUTORCH_BUILD_QNN=ON QNN_SDK_ROOT=/tmp/qnn/2.28.0.241029 bash scripts/build_android_library.sh
367367
mkdir -p extension/benchmark/android/benchmark/app/libs
368368
cp aar-out/executorch.aar extension/benchmark/android/benchmark/app/libs
369369
pushd extension/benchmark/android/benchmark

.github/workflows/android-release-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# Build AAR Package
5656
mkdir aar-out
5757
export BUILD_AAR_DIR=aar-out
58-
bash build/build_android_library.sh
58+
bash scripts/build_android_library.sh
5959
mkdir -p "${ARTIFACTS_DIR_NAME}"
6060
cp aar-out/executorch.aar "${ARTIFACTS_DIR_NAME}/executorch.aar"
6161

docs/source/using-executorch-android.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Now you can compile your app with the ExecuTorch Android library.
7070

7171
## Building from Source
7272

73-
`build/build_android_library.sh` is a helper script to build the Java library (into .jar), native library (into .so), and the packaged AAR file. It can also build
73+
`scripts/build_android_library.sh` is a helper script to build the Java library (into .jar), native library (into .so), and the packaged AAR file. It can also build
7474
demo apps to showcase the AAR is integrated into a user app correctly.
7575

7676
You need Android [SDK](https://developer.android.com/studio) and [NDK](https://developer.android.com/ndk/downloads) to use it.
@@ -81,7 +81,7 @@ You need to set `ANDROID_NDK` to the correct NDK root (containing NOTICE file).
8181

8282
```
8383
export ANDROID_NDK=/path/to/ndk
84-
sh build/build_android_library.sh
84+
sh scripts/build_android_library.sh
8585
```
8686

8787
### Optional environment variables
@@ -94,7 +94,7 @@ Set environment variable `ANDROID_ABIS` to either `arm64-v8a` or `x86_64` if you
9494
export ANDROID_ABIS=arm64-v8a
9595
# or
9696
# export ANDROID_ABIS=x86_64
97-
sh build/build_android_library.sh
97+
sh scripts/build_android_library.sh
9898
```
9999

100100
#### EXECUTORCH_CMAKE_BUILD_TYPE

examples/demo-apps/android/ExecuTorchDemo/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ popd
8686

8787
# Build the AAR. It will include XNNPACK backend by default.
8888
export BUILD_AAR_DIR=$(realpath examples/demo-apps/android/ExecuTorchDemo/app/libs)
89-
sh build/build_android_library.sh
89+
sh scripts/build_android_library.sh
9090
```
9191

9292
#### Qualcomm Hexagon NPU
@@ -107,7 +107,7 @@ popd
107107

108108
# Build the AAR. It will include XNNPACK backend by default.
109109
export BUILD_AAR_DIR=$(realpath examples/demo-apps/android/ExecuTorchDemo/app/libs)
110-
sh build/build_android_library.sh
110+
sh scripts/build_android_library.sh
111111
```
112112

113113
This is very similar to XNNPACK setup, but users now needs to define `QNN_SDK_ROOT` so that

examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The Mediatek runner (`examples/mediatek/executor_runner/mtk_llama_runner.cpp`) c
123123

124124
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.
125125
```
126-
sh build/build_android_library.sh
126+
sh scripts/build_android_library.sh
127127
```
128128

129129
**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`.

examples/demo-apps/android/LlamaDemo/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export BUILD_AAR_DIR
1212

1313
BASEDIR=$(dirname "$0")
1414
mkdir -p "$BASEDIR"/app/libs
15-
bash "$BASEDIR"/../../../../build/build_android_library.sh
15+
bash "$BASEDIR"/../../../../scripts/build_android_library.sh
1616

1717
cp "$BUILD_AAR_DIR/executorch.aar" "$BASEDIR"/app/libs/executorch.aar

extension/android_test/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BUILD_AAR_DIR="$(mktemp -d)"
1111
export BUILD_AAR_DIR
1212

1313
BASEDIR=$(dirname "$0")
14-
source "$BASEDIR"/../../build/build_android_library.sh
14+
source "$BASEDIR"/../../scripts/build_android_library.sh
1515

1616
build_native_library() {
1717
ANDROID_ABI="$1"

extension/benchmark/android/benchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Minibench is usedful for giving reference performance data when developers integ
1515
You will need executorch AAR for Java and JNI dependencies.
1616
```
1717
export ANDROID_NDK=<path_to_android_ndk>
18-
sh build/build_android_library.sh
18+
sh scripts/build_android_library.sh
1919
```
2020
and copy the AAR to `app/libs`.
2121
```

0 commit comments

Comments
 (0)