Skip to content

Commit cd6f5b0

Browse files
correctly clean output from android build (project-chip#29516)
1 parent 48d4d43 commit cd6f5b0

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/full-android.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,31 @@ jobs:
6464
./scripts/run_in_build_env.sh \
6565
"./scripts/build/build_examples.py --target android-arm-chip-tool build"
6666
- name: Clean out build output
67-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
67+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
6868
- name: Build Android arm-tv-casting-app
6969
run: |
7070
./scripts/run_in_build_env.sh \
7171
"./scripts/build/build_examples.py --target android-arm-tv-casting-app build"
7272
- name: Clean out build output
73-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
73+
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
7474
- name: Build Android arm-tv-server
7575
run: |
7676
./scripts/run_in_build_env.sh \
7777
"./scripts/build/build_examples.py --target android-arm-tv-server build"
7878
- name: Clean out build output
79-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
79+
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
8080
- name: Build Android arm64-tv-casting-app
8181
run: |
8282
./scripts/run_in_build_env.sh \
8383
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
8484
- name: Clean out build output
85-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
85+
run: rm -rf ./out examples/tv-casting-app/android/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
8686
- name: Build Android arm64-tv-server
8787
run: |
8888
./scripts/run_in_build_env.sh \
8989
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
9090
- name: Clean out build output
91-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
91+
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
9292
- name: Build Android arm64-chip-tool
9393
run: |
9494
./scripts/run_in_build_env.sh \
@@ -98,7 +98,7 @@ jobs:
9898
./scripts/run_in_build_env.sh \
9999
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
100100
- name: Clean out build output
101-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
101+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
102102
# - name: Build Android Studio build (arm64 only)
103103
# run: |
104104
# ./scripts/run_in_build_env.sh \

.github/workflows/smoketest-android.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@ jobs:
5858
./scripts/run_in_build_env.sh \
5959
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
6060
- name: Clean out build output
61-
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
61+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
6262
- name: Build Android arm64-tv-casting-app
6363
run: |
6464
./scripts/run_in_build_env.sh \
6565
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
66+
- name: Clean out build output
67+
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
6668
- name: Build Android arm64-tv-server
6769
run: |
6870
./scripts/run_in_build_env.sh \
6971
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
72+
- name: Clean out build output
73+
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar

0 commit comments

Comments
 (0)