Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly Clean out the generated jar and so files from android build #29516

Merged
merged 1 commit into from
Sep 30, 2023
Merged

Correctly Clean out the generated jar and so files from android build #29516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/full-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,31 @@ jobs:
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm-chip-tool build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
- name: Build Android arm-tv-casting-app
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm-tv-casting-app build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
- name: Build Android arm-tv-server
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm-tv-server build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
- name: Build Android arm64-tv-casting-app
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/tv-casting-app/android/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
- name: Build Android arm64-tv-server
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
- name: Build Android arm64-chip-tool
run: |
./scripts/run_in_build_env.sh \
Expand All @@ -98,7 +98,7 @@ jobs:
./scripts/run_in_build_env.sh \
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
# - name: Build Android Studio build (arm64 only)
# run: |
# ./scripts/run_in_build_env.sh \
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/smoketest-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,16 @@ jobs:
./scripts/run_in_build_env.sh \
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/*
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
- name: Build Android arm64-tv-casting-app
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
- name: Clean out build output
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
- name: Build Android arm64-tv-server
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
- name: Clean out build output
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
Loading