diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-06-03 10:42:39 -0700 |
|---|---|---|
| committer | Alexander Dorokhine <adorokhine@google.com> | 2020-06-03 10:42:39 -0700 |
| commit | 18bf22f138f3d9150644594d3e4f20b90d28a3b5 (patch) | |
| tree | dabe385478277c9abae5631a31dcb42b9ad5f968 | |
| parent | ca0fe140e5b3703bbc9aceb1dd57583290468cf5 (diff) | |
| download | manifest-18bf22f138f3d9150644594d3e4f20b90d28a3b5.tar.gz | |
Update protobuf prebuilts and source branch.
We add the protobuf 'prebuilts' repo which contains the officially
released protoc compiler, and switch both branches to the
'androidx-master-dev' branch which will contain the officially released
source code matching that compiler.
This is required to build the C++ proto lib in Jetpack with the source
code that exactly matches the protoc binary.
Bug: 157512302
Change-Id: I40b780296903ae660e6b6dbd94302e030c5b9c71
| -rw-r--r-- | default.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/default.xml b/default.xml index df10bb4b9..e500dc1f7 100644 --- a/default.xml +++ b/default.xml @@ -16,7 +16,8 @@ <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="master" /> <project path="external/icing" name="platform/external/icing" groups="pdk" /> <project path="external/icu" name="platform/external/icu" groups="pdk" clone-depth="1" revision="master" /> - <project path="external/protobuf" name="platform/external/protobuf" groups="pdk" clone-depth="1" revision="master" /> + <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf --> + <project path="external/protobuf" name="platform/external/protobuf" groups="pdk" clone-depth="1" revision="androidx-master-dev" /> <project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" groups="pdk" clone-depth="1" /> <project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" groups="pdk" clone-depth="1" /> <project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" groups="pdk" clone-depth="1" /> @@ -24,6 +25,8 @@ <!-- Config: shallow + master revision --> <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" groups="pdk-fs" clone-depth="1" revision="master" /> <project path="prebuilts/ktlint" name="platform/prebuilts/ktlint" groups="pdk-fs" clone-depth="1" revision="master" /> + <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf --> + <project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" groups="pdk-fs" clone-depth="1" revision="androidx-master-dev" /> <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" revision="master" /> <!-- Gradle dependencies --> <!-- Config: shallow --> |