diff options
| author | Jens Ole Lauridsen <jlauridsen@google.com> | 2024-03-15 18:51:41 +0000 |
|---|---|---|
| committer | Jens Ole Lauridsen <jlauridsen@google.com> | 2024-03-15 19:20:00 +0000 |
| commit | 785c7380b8d80df26a6c3aa5eabdc99ba5af5ac1 (patch) | |
| tree | c2e5c01a0ff1ac5a58168405977526ee2ddc272c | |
| parent | 2f9be1381af21d07ddd440a23d24897676ca988a (diff) | |
| parent | 640da92decec54c06fda4035b0b306244ca1f411 (diff) | |
| download | manifest-studio-main.tar.gz | |
[conflict] Remove skia dependencies from manifest am: 640da92decstudio-main
Original change: https://googleplex-android-review.googlesource.com/c/platform/manifest/+/26516566
Change-Id: Id5d8e252b98e44d73ab269df3c483e1e3a319187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | default.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/default.xml b/default.xml index 9949edce2..e72966ac1 100644 --- a/default.xml +++ b/default.xml @@ -24,19 +24,16 @@ <project path="external/dexter" name="platform/tools/dexter" revision="861a1b26fc155344d9746afec6f8b6cf4ea3e2d8" /> <project path="external/doclava" name="platform/external/doclava" revision="main" /> <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="main" /> - <project path="external/freetype" name="platform/external/freetype" revision="6755a619c71943131573dd55b964ed114f1d3856" /> <project path="external/gflags" name="platform/external/gflags" /> <project path="external/googletest" name="platform/external/googletest" revision="e87584ebb141cd532f4688556835903c44563292" /> <project path="external/grpc-grpc" name="platform/external/grpc-grpc" /> <project path="external/jarjar" name="platform/external/jarjar" revision="d3621fd17af424efc1fe4b527531e0b5282e77ee"/> <project path="external/jetbrains/intellij-kotlin" name="platform/external/jetbrains/intellij-kotlin" revision="studio-main" /> <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" revision="studio-main" /> - <project path="external/libpng" name="platform/external/libpng" revision="80c03e1c7bd6d3edebe795375103927bef2b67f3" /> <project path="external/nanopb-c" name="platform/external/nanopb-c" /> <project path="external/perfetto" name="platform/external/perfetto" revision="31155364cd4e79d09c92df884510e149ca67df5e" /> <project path="external/protobuf" name="platform/external/protobuf" /> <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="bd7cdd4d3776c9d08bbfea96d711958b24a9fe9c" /> - <project path="external/skia" name="platform/external/skia" revision="0a1502782144e54d9a50ccaa3f5d0d09bc73cadb" clone-depth="1" /> <project path="external/zlib" name="platform/external/zlib" revision="6d58d7f640488f9828a9692a303119a0bc7b8484"/> <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="studio-main" /> <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" /> |