diff options
| author | Xin Li <delphij@google.com> | 2022-04-28 17:18:41 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-04-28 17:18:41 -0700 |
| commit | 5b6b139ac3bec39e4177e6ebc7eee0c6f52f8e57 (patch) | |
| tree | 5f9fdc0a97df253cb15a5e0ce9e582bb26df66b0 | |
| parent | 6c765c4e3b924c080bbccec0f7526def79db218a (diff) | |
| download | manifest-5b6b139ac3bec39e4177e6ebc7eee0c6f52f8e57.tar.gz | |
Make external/tink use emu-master-dev.
In earlier revision (aosp/1950539) the manifest was referencing
upstream-master, which is replicated from GitHub (google/tink).
This can cause issues in the future as the upstream was a replica from
google3 via copybara, but there is no presubmit validation in place to
prevent breaking our branch.
For now, create a emu-master-dev based on the latest upstream-master and
point the manifest back to the AOSP branch instead.
Bug: 230761320
Change-Id: I10a60857b10bcab485727942b35472bfd2f3a17e
| -rw-r--r-- | default.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml index 80141c02f..32200756d 100644 --- a/default.xml +++ b/default.xml @@ -68,7 +68,7 @@ <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="master"/> <!-- Tink security library and dependencies, we use upstream so we automatically get the latest security fixes --> - <project path="external/tink" name="platform/external/tink" revision="upstream-master"/> + <project path="external/tink" name="platform/external/tink" /> <project path="external/rapidjson" name="platform/external/rapidjson" revision="master"/> <!-- Bring in the root-canal, bluetooth dependencies --> |