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

Fixing linux tv-casting-app's build #18389

Merged
merged 2 commits into from
May 14, 2022
Merged

Fixing linux tv-casting-app's build #18389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86431a
Fixing linux tv-casting-app's build
sharadb-amazon May 12, 2022
7e0831b
Adding build of linux tv-casting-app back into CI
sharadb-amazon May 12, 2022
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
11 changes: 11 additions & 0 deletions .github/workflows/examples-linux-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@ jobs:
linux debug tv-app \
out/tv_app_debug/chip-tv-app \
/tmp/bloat_reports/
- name: Build example Standalone TV Casting App
timeout-minutes: 10
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-x64-tv-casting-app \
build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
linux debug tv-casting-app \
out/linux-x64-tv-casting-app/chip-tv-casting-app \
/tmp/bloat_reports/
- name: Build example lighting app with RPCs
timeout-minutes: 10
run: |
Expand Down
3 changes: 2 additions & 1 deletion examples/tv-casting-app/linux/CastingUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ void HandleUDCSendExpiration(System::Layer * aSystemLayer, void * context)

// Send User Directed commissioning request
ReturnOnFailure(CastingServer::GetInstance()->SendUserDirectedCommissioningRequest(chip::Transport::PeerAddress::UDP(
selectedCommissioner->ipAddress[0], selectedCommissioner->port, selectedCommissioner->interfaceId)));
selectedCommissioner->resolutionData.ipAddress[0], selectedCommissioner->resolutionData.port,
selectedCommissioner->resolutionData.interfaceId)));
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT

Expand Down
2 changes: 2 additions & 0 deletions scripts/build/build/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ def HostTargets():
target_native.Extend('rpc-console', app=HostApp.RPC_CONSOLE))
app_targets.append(
target_native.Extend('tv-app', app=HostApp.TV_APP))
app_targets.append(
target_native.Extend('tv-casting-app', app=HostApp.TV_CASTING_APP))
app_targets.append(
target_native.Extend('nl-test-runner', app=HostApp.NL_TEST_RUNNER))

Expand Down
6 changes: 6 additions & 0 deletions scripts/build/builders/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class HostApp(Enum):
MIN_MDNS = auto()
ADDRESS_RESOLVE = auto()
TV_APP = auto()
TV_CASTING_APP = auto()
LOCK = auto()
TESTS = auto()
SHELL = auto()
Expand All @@ -52,6 +53,8 @@ def ExamplePath(self):
return 'minimal-mdns'
elif self == HostApp.TV_APP:
return 'tv-app/linux'
elif self == HostApp.TV_CASTING_APP:
return 'tv-casting-app/linux'
elif self == HostApp.LOCK:
return 'lock-app/linux'
elif self == HostApp.SHELL:
Expand Down Expand Up @@ -95,6 +98,9 @@ def OutputNames(self):
elif self == HostApp.TV_APP:
yield 'chip-tv-app'
yield 'chip-tv-app.map'
elif self == HostApp.TV_CASTING_APP:
yield 'chip-tv-casting-app'
yield 'chip-tv-casting-app.map'
elif self == HostApp.LOCK:
yield 'chip-lock-app'
yield 'chip-lock-app.map'
Expand Down
12 changes: 12 additions & 0 deletions scripts/build/testdata/build_linux_on_x64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
# Generating linux-x64-tv-app-ipv6only
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-tv-app-ipv6only

# Generating linux-x64-tv-casting-app
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-casting-app/linux {out}/linux-x64-tv-casting-app

# Generating linux-x64-tv-casting-app-ipv6only
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-casting-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-tv-casting-app-ipv6only

# Building linux-arm64-all-clusters
ninja -C {out}/linux-arm64-all-clusters

Expand Down Expand Up @@ -284,3 +290,9 @@ ninja -C {out}/linux-x64-tv-app

# Building linux-x64-tv-app-ipv6only
ninja -C {out}/linux-x64-tv-app-ipv6only

# Building linux-x64-tv-casting-app
ninja -C {out}/linux-x64-tv-casting-app

# Building linux-x64-tv-casting-app-ipv6only
ninja -C {out}/linux-x64-tv-casting-app-ipv6only