Skip to content

Commit

Permalink
Update android for build, fix artifacts for tv server app (#20422)
Browse files Browse the repository at this point in the history
* Update android builds:

- fix naming to remove CHIP_ prefix (too repretitive)
- fix artifact names for TV app as it is split in content and platform
  sides. Verfied by running:

```
./scripts/build/build_examples.py --target android-arm64-chip-tvserver build --copy-artifacts-to out/artifacts
```

* Update naming build build_all to remove some of the chip prefixes

* Fix glob for full android builds now that chip prefix was removed
  • Loading branch information
andy31415 authored Jul 7, 2022
1 parent 27a9e15 commit 150b16b
Show file tree
Hide file tree
Showing 6 changed files with 418 additions and 296 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/full-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ jobs:
- name: Build Android CHIPTool and CHIPTest (ARM)
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm-chip-*' build"
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm-*' build"
- name: Clean out build output
run: rm -rf ./out
- name: Build Android CHIPTool and CHIPTest (ARM64)
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm64-chip-*' build"
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm64-*' build"
- name: Run Android build rule tests
run: |
./scripts/run_in_build_env.sh \
Expand Down
12 changes: 6 additions & 6 deletions scripts/build/build/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,12 +447,12 @@ def AndroidTargets():
yield target.Extend('androidstudio-arm64-chip-tool', board=AndroidBoard.AndroidStudio_ARM64, app=AndroidApp.CHIP_TOOL)
yield target.Extend('androidstudio-x86-chip-tool', board=AndroidBoard.AndroidStudio_X86, app=AndroidApp.CHIP_TOOL)
yield target.Extend('androidstudio-x64-chip-tool', board=AndroidBoard.AndroidStudio_X64, app=AndroidApp.CHIP_TOOL)
yield target.Extend('arm64-chip-tvserver', board=AndroidBoard.ARM64, app=AndroidApp.CHIP_TVServer)
yield target.Extend('arm-chip-tvserver', board=AndroidBoard.ARM, app=AndroidApp.CHIP_TVServer)
yield target.Extend('x86-chip-tvserver', board=AndroidBoard.X86, app=AndroidApp.CHIP_TVServer)
yield target.Extend('x64-chip-tvserver', board=AndroidBoard.X64, app=AndroidApp.CHIP_TVServer)
yield target.Extend('arm64-chip-tv-casting-app', board=AndroidBoard.ARM64, app=AndroidApp.CHIP_TV_CASTING_APP)
yield target.Extend('arm-chip-tv-casting-app', board=AndroidBoard.ARM, app=AndroidApp.CHIP_TV_CASTING_APP)
yield target.Extend('arm64-tv-server', board=AndroidBoard.ARM64, app=AndroidApp.TV_SERVER)
yield target.Extend('arm-tv-server', board=AndroidBoard.ARM, app=AndroidApp.TV_SERVER)
yield target.Extend('x86-tv-server', board=AndroidBoard.X86, app=AndroidApp.TV_SERVER)
yield target.Extend('x64-tv-server', board=AndroidBoard.X64, app=AndroidApp.TV_SERVER)
yield target.Extend('arm64-tv-casting-app', board=AndroidBoard.ARM64, app=AndroidApp.TV_SERVER)
yield target.Extend('arm-tv-casting-app', board=AndroidBoard.ARM, app=AndroidApp.TV_SERVER)


def MbedTargets():
Expand Down
Loading

0 comments on commit 150b16b

Please sign in to comment.