Simplify stuff

Author: kirklandsign

build/build_android_library.sh

@@ -137,37 +137,6 @@ build_aar() {
   popd
 }
 
-build_android_demo_apps() {
-  mkdir -p examples/demo-apps/android/LlamaDemo/app/libs
-  cp ${BUILD_AAR_DIR}/executorch.aar examples/demo-apps/android/LlamaDemo/app/libs
-  pushd examples/demo-apps/android/LlamaDemo
-  ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
-  popd
-
-  mkdir -p extension/benchmark/android/benchmark/app/libs
-  cp ${BUILD_AAR_DIR}/executorch.aar extension/benchmark/android/benchmark/app/libs
-  pushd extension/benchmark/android/benchmark
-  ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
-  popd
-}
-
-collect_artifacts_to_be_uploaded() {
-  ARTIFACTS_DIR_NAME="$1"
-  DEMO_APP_DIR="${ARTIFACTS_DIR_NAME}/llm_demo"
-  # The app directory is named using its build flavor as a suffix.
-  mkdir -p "${DEMO_APP_DIR}"
-  # Collect the app and its test suite
-  cp examples/demo-apps/android/LlamaDemo/app/build/outputs/apk/debug/*.apk "${DEMO_APP_DIR}"
-  cp examples/demo-apps/android/LlamaDemo/app/build/outputs/apk/androidTest/debug/*.apk "${DEMO_APP_DIR}"
-  # Collect AAR
-  cp "${BUILD_AAR_DIR}/executorch.aar" "${DEMO_APP_DIR}"
-  # Collect MiniBench APK
-  MINIBENCH_APP_DIR="${ARTIFACTS_DIR_NAME}/minibench"
-  mkdir -p "${MINIBENCH_APP_DIR}"
-  cp extension/benchmark/android/benchmark/app/build/outputs/apk/debug/*.apk "${MINIBENCH_APP_DIR}"
-  cp extension/benchmark/android/benchmark/app/build/outputs/apk/androidTest/debug/*.apk "${MINIBENCH_APP_DIR}"
-}
-
 main() {
   if [[ -z "${BUILD_AAR_DIR:-}" ]]; then
     BUILD_AAR_DIR="$(mktemp -d)"
@@ -185,10 +154,6 @@ main() {
     build_android_native_library ${ANDROID_ABI}
   done
   build_aar
-  # build_android_demo_apps
-  # if [ -n "$ARTIFACTS_DIR_NAME" ]; then
-    # collect_artifacts_to_be_uploaded ${ARTIFACTS_DIR_NAME}
-  # fi
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then

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

@@ -13,13 +13,7 @@ if [ -z "$QNN_SDK_ROOT" ]; then
 fi
 
 BASEDIR=$(dirname "$0")
-source "$BASEDIR"/../../../../build/build_android_library.sh
+ANDROID_ABIS="arm64-v8a" bash "$BASEDIR"/setup.sh
 
 BUILD_AAR_DIR="$(mktemp -d)"
 export BUILD_AAR_DIR
-
-build_jar
-build_android_native_library "arm64-v8a"
-build_aar
-mkdir -p "$BASEDIR"/app/libs
-cp "$BUILD_AAR_DIR/executorch.aar" "$BASEDIR"/app/libs/executorch.aar

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

@@ -7,15 +7,11 @@
 
 set -eu
 
-BASEDIR=$(dirname "$0")
-source "$BASEDIR"/../../../../build/build_android_library.sh
-
 BUILD_AAR_DIR="$(mktemp -d)"
 export BUILD_AAR_DIR
 
-build_jar
-build_android_native_library "arm64-v8a"
-build_android_native_library "x86_64"
-build_aar
+BASEDIR=$(dirname "$0")
 mkdir -p "$BASEDIR"/app/libs
+bash "$BASEDIR"/../../../../build/build_android_library.sh
+
 cp "$BUILD_AAR_DIR/executorch.aar" "$BASEDIR"/app/libs/executorch.aar