Integrate all GoB deps into manifest
Also merge flaky_repos into external_full, since those are mirrored now
too.
BUG=b/385391035
TEST=repo init, sync, local build
RELEASE_NOTE=None
Change-Id: I1570719ee1e335aac9983d15c8ff32c5204bfa14
Reviewed-on: https://cos-review.googlesource.com/c/cos/manifest/+/91619
Tested-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-by: Nandhini Rengaraj <nrengaraj@google.com>
diff --git a/external_full.xml b/external_full.xml
index 96dd560..91c6d60 100644
--- a/external_full.xml
+++ b/external_full.xml
@@ -16,8 +16,6 @@
<manifest>
- <include name="flaky_repos.xml" />
-
<remote name="cos"
fetch="https://cos.googlesource.com"
review="https://cos-review.googlesource.com" />
@@ -83,6 +81,81 @@
<project path="src/third_party/gtest-parallel"
name="mirrors/github.com/google/gtest-parallel"
revision="96f4f904922f9bf66689e749c40f314845baaac8" />
+ <project path="src/third_party/autotest/files/server/cros/faft/fw-testing-configs"
+ name="mirrors/cros/chromiumos/platform/fw-testing-configs"
+ revision="c34c4cd6009d2324beee3691ccfe397c159c8c81" />
+ <project path="src/platform/tast"
+ name="mirrors/cros/chromiumos/platform/tast"
+ revision="aa0271aa614c94deefa8d788d932fc6fd44520f4" />
+ <project path="src/platform/tast-tests"
+ name="mirrors/cros/chromiumos/platform/tast-tests"
+ revision="443f06dc18fd477862f732780bfe9271c0a4e19e" />
+ <project path="src/platform/tast-tests/src/chromiumos/tast/remote/firmware/data/fw-testing-configs"
+ name="mirrors/cros/chromiumos/platform/fw-testing-configs"
+ revision="c34c4cd6009d2324beee3691ccfe397c159c8c81" />
+ <project path="src/platform/microbenchmarks"
+ name="mirrors/cros/chromiumos/platform/microbenchmarks"
+ revision="eb33d21a7ea4733ce0e2d12a8bab77944a813aeb" />
+ <project path="src/third_party/hdctools"
+ name="mirrors/cros/chromiumos/third_party/hdctools"
+ revision="66d29c2ff7f06307db66f01804f7705e2e456bf9" />
+ <project path="src/third_party/rootdev"
+ name="mirrors/cros/chromiumos/third_party/rootdev"
+ revision="9c14c4406c973c4feb0cbb63fa646219656f6088" />
+ <project path="src/third_party/breakpad"
+ name="mirrors/cros/breakpad/breakpad"
+ revision="2481554490026ab9386ebc654343132d06194ce5" />
+ <project path="src/third_party/breakpad/src/third_party/lss"
+ name="mirrors/cros/linux-syscall-support"
+ revision="9719c1e1e676814c456b55f5f070eabad6709d31" />
+ <project path="src/aosp/system/update_engine"
+ name="mirrors/cros/aosp/platform/system/update_engine"
+ revision="e4c4df48ca7dcafc9de9ba51d2c3458a8fa0a99d" />
+ <project path="src/third_party/llvm-project"
+ name="mirrors/github.com/llvm/llvm-project"
+ revision="14f0776550b5a49e1c42f49a00213f7f3fa047bf" />
+ <project path="src/third_party/googletest"
+ name="mirrors/github.com/google/googletest"
+ revision="8fa9461cc28e053d66f17132808d287ae51575e2" />
+ <project path="src/third_party/linux-firmware"
+ name="mirrors/cros/chromiumos/third_party/linux-firmware"
+ revision="e38f6ea9e98d2377fd794a5934c3a21948c0f25b" />
+ <project path="src/platform/empty-project"
+ name="mirrors/cros/chromiumos/infra/build/empty-project"
+ revision="d2d95e8af89939f893b1443135497c1f5572aebc" />
+ <project path="src/aosp/system/libsync"
+ name="mirrors/cros/aosp/platform/system/core/libsync"
+ revision="f4f4387b6bf2387efbcfd1453af4892e8982faf6" />
+ <project path="src/config"
+ name="mirrors/cros/chromiumos/config"
+ revision="c20f619dab7592546e4b6b68922fc62e5cb6ae32" />
+ <project path="src/platform/minijail"
+ name="mirrors/cros/chromiumos/platform/minijail"
+ revision="fc020fd4672b3340ee706e192d043e12df8c8578" />
+ <project path="src/third_party/seismograph"
+ name="mirrors/github.com/coreos/seismograph"
+ revision="edbe2360e9af362914868df0c7c1ace62e8e1778" />
+ <project path="src/chromium/src/components/policy"
+ name="mirrors/cros/chromium/src/components/policy"
+ revision="aaa634d71e47c9f865f8ab3c590e017523815055" />
+ <project path="src/chromium/src/third_party/private_membership"
+ name="mirrors/cros/chromium/src/third_party/private_membership"
+ revision="ac0d8f7d4f21a0e56c76feef0eeb4360b52a0b54" />
+ <project path="src/chromium/src/third_party/shell-encryption"
+ name="mirrors/cros/chromium/src/third_party/shell-encryption"
+ revision="5b67b0d68d1e343bb9c9065f8464ad5abfac7972" />
+ <project path="src/third_party/dbus"
+ name="mirrors/cros/chromiumos/third_party/dbus"
+ revision="refs/heads/chromeos-1.14.10" />
+ <project path="src/aosp/external/perfetto"
+ name="mirrors/android/platform/external/perfetto"
+ revision="5d157cfb932c65c7803da78b9ab5c9d7931776f5" />
+ <project path="src/third_party/flashrom"
+ name="mirrors/cros/chromiumos/third_party/flashrom"
+ revision="7524d7f4c89293c6a75353220036ddabaa844383" />
+ <project path="src/platform/libchrome"
+ name="mirrors/cros/chromiumos/platform/libchrome"
+ revision="3e93855c118b357ee70ed9b60e76a8a94cd07042" />
<!-- COS sources -->
<project path="src/overlays"
diff --git a/flaky_repos.xml b/flaky_repos.xml
deleted file mode 100644
index 2202d47..0000000
--- a/flaky_repos.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
- Copyright 2020 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- The following repositories have caused build failures due to intermittent
- fetch issues. Since "repo sync" can handle flaky repositories, we add
- them here so that they will be in the source tree.
--->
-<manifest>
-
- <remote name="chromium"
- fetch="https://chromium.googlesource.com"
- review="https://chromium-review.googlesource.com" />
-
- <!--
- These repositories do not need to be pinned to a specific commit SHA
- because their ebuilds already pin to a specific commit SHA. We just need
- to make sure that the commit SHA needed by the ebuild is reachable by the
- revision written here.
-
- However, we still pin to a commit SHA to avoid generating a ton of erroneous
- build numbers.
- -->
- <project path="src/third_party/autotest/files/server/cros/faft/fw-testing-configs"
- name="chromiumos/platform/fw-testing-configs"
- revision="c34c4cd6009d2324beee3691ccfe397c159c8c81"
- remote="chromium" />
- <project path="src/platform/tast"
- name="chromiumos/platform/tast"
- revision="aa0271aa614c94deefa8d788d932fc6fd44520f4"
- remote="chromium" />
- <project path="src/platform/tast-tests"
- name="chromiumos/platform/tast-tests"
- revision="443f06dc18fd477862f732780bfe9271c0a4e19e"
- remote="chromium" />
- <project path="src/platform/tast-tests/src/chromiumos/tast/remote/firmware/data/fw-testing-configs"
- name="chromiumos/platform/fw-testing-configs"
- revision="c34c4cd6009d2324beee3691ccfe397c159c8c81"
- remote="chromium" />
- <project path="src/platform/microbenchmarks"
- name="chromiumos/platform/microbenchmarks"
- revision="eb33d21a7ea4733ce0e2d12a8bab77944a813aeb"
- remote="chromium" />
- <project path="src/third_party/hdctools"
- name="chromiumos/third_party/hdctools"
- revision="66d29c2ff7f06307db66f01804f7705e2e456bf9"
- remote="chromium" />
- <project path="src/third_party/rootdev"
- name="chromiumos/third_party/rootdev"
- revision="9c14c4406c973c4feb0cbb63fa646219656f6088"
- remote="chromium" />
-
- <!--
- breakpad and lss are special; they need to be pinned to specific commit
- SHAs, similar to our mirrored repositories.
- -->
- <project path="src/third_party/breakpad"
- name="breakpad/breakpad"
- revision="2481554490026ab9386ebc654343132d06194ce5"
- remote="chromium" />
- <project path="src/third_party/breakpad/src/third_party/lss"
- name="linux-syscall-support.git"
- revision="9719c1e1e676814c456b55f5f070eabad6709d31"
- remote="chromium" />
-
-</manifest>
-
