Skip to content

Commit 0b62f4b

Browse files
committed
add to gh workflow
1 parent b8b5146 commit 0b62f4b

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

.github/workflows/_android.yml

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug.apk
7474
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/app-debug-androidTest.apk
7575
curl -O https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/fp32-xnnpack-custom/model.zip
76+
curl -o https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/library_test_dir/app-debug.apk android-test-debug.apk
77+
curl -o https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/library_test_dir/app-debug-androidTest.apk android-test-debug-androidTest.apk
7678
unzip model.zip
7779
mv *.pte model.pte
7880

build/build_android_llm_demo.sh

+10
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ build_android_demo_apps() {
134134
pushd extension/benchmark/android/benchmark
135135
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
136136
popd
137+
138+
pushd extension/android_test
139+
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew testDebugUnitTest
140+
ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build assembleAndroidTest
141+
popd
137142
}
138143

139144
collect_artifacts_to_be_uploaded() {
@@ -158,6 +163,11 @@ collect_artifacts_to_be_uploaded() {
158163
mkdir -p "${MINIBENCH_APP_DIR}"
159164
cp extension/benchmark/android/benchmark/app/build/outputs/apk/debug/*.apk "${MINIBENCH_APP_DIR}"
160165
cp extension/benchmark/android/benchmark/app/build/outputs/apk/androidTest/debug/*.apk "${MINIBENCH_APP_DIR}"
166+
# Collect Java library test
167+
JAVA_LIBRARY_TEST_DIR="${ARTIFACTS_DIR_NAME}/library_test_dir"
168+
mkdir -p "${JAVA_LIBRARY_TEST_DIR}"
169+
cp extension/android_test/build/outputs/apk/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}"
170+
cp extension/android_test/build/outputs/apk/androidTest/debug/*.apk "${JAVA_LIBRARY_TEST_DIR}"
161171
}
162172

163173
main() {

build/run_android_emulator.sh

+5
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,8 @@ adb shell mkdir -p /data/local/tmp/llama
2525
adb push model.pte /data/local/tmp/llama
2626
adb push tokenizer.bin /data/local/tmp/llama
2727
adb shell am instrument -w -r com.example.executorchllamademo.test/androidx.test.runner.AndroidJUnitRunner
28+
29+
adb install -t android-test-debug.apk
30+
adb install -t android-test-debug-androidTest.apk
31+
32+
adb shell am instrument -w -r org.pytorch.executorch.test/androidx.test.runner.AndroidJUnitRunner

extension/android_test/build.gradle

+3-12
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,13 @@
55
* This source code is licensed under the BSD-style license found in the
66
* LICENSE file in the root directory of this source tree.
77
*/
8-
buildscript {
9-
repositories {
10-
google()
11-
mavenCentral()
12-
gradlePluginPortal()
13-
}
14-
dependencies {
15-
classpath 'com.android.tools.build:gradle:7.3.0'
16-
}
8+
plugins {
9+
id("com.android.application") version "8.1.0" apply false
1710
}
1811

19-
20-
apply plugin: 'com.android.library'
21-
2212
group 'org.pytorch.executorch'
2313

14+
apply plugin: "com.android.application"
2415

2516
android {
2617
namespace 'org.pytorch.executorch'

0 commit comments

Comments
 (0)