Skip to content

Commit 1003228

Browse files
andy31415andreilitvin
authored andcommitted
Clean out android outputs more aggressively (#27297)
Builds unfortunately are placing files in the source tree instead of just limiting themselves to out. Try to clean things a bit more thoroughly. Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent d7ea5f6 commit 1003228

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/full-android.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,31 +90,31 @@ jobs:
9090
./scripts/run_in_build_env.sh \
9191
"./scripts/build/build_examples.py --target android-arm-chip-tool build"
9292
- name: Clean out build output
93-
run: rm -rf ./out
93+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
9494
- name: Build Android arm-tv-casting-app
9595
run: |
9696
./scripts/run_in_build_env.sh \
9797
"./scripts/build/build_examples.py --target android-arm-tv-casting-app build"
9898
- name: Clean out build output
99-
run: rm -rf ./out
99+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
100100
- name: Build Android arm-tv-server
101101
run: |
102102
./scripts/run_in_build_env.sh \
103103
"./scripts/build/build_examples.py --target android-arm-tv-server build"
104104
- name: Clean out build output
105-
run: rm -rf ./out
105+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
106106
- name: Build Android arm64-tv-casting-app
107107
run: |
108108
./scripts/run_in_build_env.sh \
109109
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
110110
- name: Clean out build output
111-
run: rm -rf ./out
111+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
112112
- name: Build Android arm64-tv-server
113113
run: |
114114
./scripts/run_in_build_env.sh \
115115
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
116116
- name: Clean out build output
117-
run: rm -rf ./out
117+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
118118
- name: Build Android arm64-chip-tool
119119
run: |
120120
./scripts/run_in_build_env.sh \
@@ -124,7 +124,7 @@ jobs:
124124
./scripts/run_in_build_env.sh \
125125
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
126126
- name: Clean out build output
127-
run: rm -rf ./out
127+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
128128
# - name: Build Android Studio build (arm64 only)
129129
# run: |
130130
# ./scripts/run_in_build_env.sh \

.github/workflows/smoketest-android.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ jobs:
8484
run: |
8585
./scripts/run_in_build_env.sh \
8686
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
87+
- name: Clean out build output
88+
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
8789
- name: Build Android arm64-tv-casting-app
8890
run: |
8991
./scripts/run_in_build_env.sh \

0 commit comments

Comments
 (0)