Skip to content

Commit

Permalink
Bump third_party/pigweed/repo from 5eccd87 to 5d8f62a (project-ch…
Browse files Browse the repository at this point in the history
…ip#30571)

* Bump third_party/pigweed/repo from `5eccd87` to `5d8f62a`

Bumps [third_party/pigweed/repo](https://github.com/google/pigweed) from `5eccd87` to `5d8f62a`.
- [Commits](google/pigweed@5eccd87...5d8f62a)

---
updated-dependencies:
- dependency-name: third_party/pigweed/repo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Undo env patching for examples - pigweed can do this now

* Remove absolute path patching

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrei Litvin <[email protected]>
  • Loading branch information
dependabot[bot] and andy31415 authored Nov 20, 2023
1 parent d12edc4 commit 8dce277
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 98 deletions.
34 changes: 0 additions & 34 deletions examples/build_overrides/pigweed_environment.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,3 @@ _bootstrap_root = "//third_party/connectedhomeip"

import("${_bootstrap_root}/build_overrides/pigweed_environment.gni")

# Rebase paths to our root.
# This rebasing is only done if the paths are repo-relative
# (i.e. start with "//")
if (defined(pw_env_setup_CIPD_ARM)) {
_split_CIPD_ARM = string_split(pw_env_setup_CIPD_ARM, "//")
if (_split_CIPD_ARM[0] == "") {
pw_env_setup_CIPD_ARM =
get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_ARM}", "abspath")
}
}
if (defined(pw_env_setup_CIPD_PIGWEED)) {
_split_CIPD_PIGWEED = string_split(pw_env_setup_CIPD_PIGWEED, "//")
if (_split_CIPD_PIGWEED[0] == "") {
pw_env_setup_CIPD_PIGWEED =
get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PIGWEED}",
"abspath")
}
}
if (defined(pw_env_setup_CIPD_PYTHON)) {
_split_CIPD_PYTHON = string_split(pw_env_setup_CIPD_PYTHON, "//")
if (_split_CIPD_PYTHON[0] == "") {
pw_env_setup_CIPD_PYTHON =
get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PYTHON}",
"abspath")
}
}
if (defined(pw_env_setup_VIRTUAL_ENV)) {
_split_VIRTUAL_ENV = string_split(pw_env_setup_VIRTUAL_ENV, "//")
if (_split_VIRTUAL_ENV[0] == "") {
pw_env_setup_VIRTUAL_ENV =
get_path_info("${_bootstrap_root}/${pw_env_setup_VIRTUAL_ENV}",
"abspath")
}
}
9 changes: 0 additions & 9 deletions scripts/setup/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,6 @@ if [ -n "$BASH" ]; then
. "$_CHIP_ROOT/scripts/helpers/bash-completion.sh"
fi

# Update relative paths to absolute (if they exist)
# to make sure loading of paths works in build_examples
#
# See https://github.com/project-chip/connectedhomeip/issues/30475
# for details
scripts/setup/gni_make_paths_absolute.py \
--root "$_CHIP_ROOT" \
build_overrides/pigweed_environment.gni

unset -f _bootstrap_or_activate
unset -f _install_additional_pip_requirements

Expand Down
54 changes: 0 additions & 54 deletions scripts/setup/gni_make_paths_absolute.py

This file was deleted.

2 changes: 1 addition & 1 deletion third_party/pigweed/repo
Submodule repo updated 677 files

0 comments on commit 8dce277

Please sign in to comment.