Move skia into garnet
This change makes Skia available at the Garnet layer, including some support
libraries required by Skia.
Change-Id: Ic50b5c396d73cefa43a3653335c2d312acaa1f20
diff --git a/garnet b/garnet
index 9c9bfa7..18a1bd4 100644
--- a/garnet
+++ b/garnet
@@ -8,6 +8,7 @@
<localimport file="runtimes/dart"/>
<localimport file="runtimes/go"/>
<localimport file="runtimes/rust"/>
+ <localimport file="skia"/>
</imports>
<projects>
diff --git a/skia b/skia
new file mode 100644
index 0000000..d5a44bd
--- /dev/null
+++ b/skia
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <projects>
+ <project name="third_party/expat"
+ path="third_party/expat"
+ remote="https://fuchsia.googlesource.com/third_party/expat"
+ gerrithost="https://fuchsia-review.googlesource.com"
+ githooks="manifest/git-hooks"/>
+ <project name="third_party/freetype2"
+ path="third_party/freetype2"
+ remote="https://fuchsia.googlesource.com/third_party/freetype2"
+ gerrithost="https://fuchsia-review.googlesource.com"
+ githooks="manifest/git-hooks"/>
+ <project name="third_party/libjpeg-turbo"
+ path="third_party/libjpeg-turbo"
+ remote="https://fuchsia.googlesource.com/third_party/libjpeg-turbo"
+ gerrithost="https://fuchsia-review.googlesource.com"
+ githooks="manifest/git-hooks"/>
+ <project name="third_party/libpng"
+ path="third_party/libpng"
+ remote="https://fuchsia.googlesource.com/third_party/libpng"
+ gerrithost="https://fuchsia-review.googlesource.com"
+ githooks="manifest/git-hooks"/>
+ <project name="external/skia.googlesource.com/skia"
+ path="third_party/skia"
+ remote="https://skia.googlesource.com/skia"
+ revision="6f67cf7c4e14a65a54ee1fc67e81e5aa3d1e3d0e"/>
+ <project name="third_party/yasm"
+ path="third_party/yasm"
+ remote="https://fuchsia.googlesource.com/third_party/yasm"
+ gerrithost="https://fuchsia-review.googlesource.com"
+ githooks="manifest/git-hooks"/>
+ </projects>
+</manifest>
diff --git a/userspace b/userspace
index d71551d..0272f81 100644
--- a/userspace
+++ b/userspace
@@ -35,21 +35,11 @@
revision="30590636487cb976a7ad850024abb16a5f44a320"
gerrithost="https://fuchsia-review.googlesource.com"
githooks="manifest/git-hooks"/>
- <project name="third_party/expat"
- path="third_party/expat"
- remote="https://fuchsia.googlesource.com/third_party/expat"
- gerrithost="https://fuchsia-review.googlesource.com"
- githooks="manifest/git-hooks"/>
<project name="third_party/ffmpeg"
path="third_party/ffmpeg"
remote="https://fuchsia.googlesource.com/third_party/ffmpeg"
gerrithost="https://fuchsia-review.googlesource.com"
githooks="manifest/git-hooks"/>
- <project name="third_party/freetype2"
- path="third_party/freetype2"
- remote="https://fuchsia.googlesource.com/third_party/freetype2"
- gerrithost="https://fuchsia-review.googlesource.com"
- githooks="manifest/git-hooks"/>
<project name="third_party/git"
path="third_party/git"
remote="https://fuchsia.googlesource.com/third_party/git"
@@ -70,16 +60,6 @@
remote="https://fuchsia.googlesource.com/third_party/iperf"
gerrithost="https://fuchsia-review.googlesource.com"
githooks="manifest/git-hooks"/>
- <project name="third_party/libjpeg-turbo"
- path="third_party/libjpeg-turbo"
- remote="https://fuchsia.googlesource.com/third_party/libjpeg-turbo"
- gerrithost="https://fuchsia-review.googlesource.com"
- githooks="manifest/git-hooks"/>
- <project name="third_party/libpng"
- path="third_party/libpng"
- remote="https://fuchsia.googlesource.com/third_party/libpng"
- gerrithost="https://fuchsia-review.googlesource.com"
- githooks="manifest/git-hooks"/>
<project name="third_party/libteken"
path="third_party/libteken"
remote="https://fuchsia.googlesource.com/third_party/libteken"
@@ -110,10 +90,6 @@
remote="https://fuchsia.googlesource.com/third_party/re2"
gerrithost="https://fuchsia-review.googlesource.com"
githooks="manifest/git-hooks"/>
- <project name="external/skia.googlesource.com/skia"
- path="third_party/skia"
- remote="https://skia.googlesource.com/skia"
- revision="6f67cf7c4e14a65a54ee1fc67e81e5aa3d1e3d0e"/>
<project name="third_party/snappy"
path="third_party/snappy"
remote="https://fuchsia.googlesource.com/third_party/snappy"
@@ -139,10 +115,5 @@
remote="https://fuchsia.googlesource.com/third_party/gflags"
gerrithost="https://fuchsia-review.googlesource.com"
githooks="manifest/git-hooks"/>
- <project name="third_party/yasm"
- path="third_party/yasm"
- remote="https://fuchsia.googlesource.com/third_party/yasm"
- gerrithost="https://fuchsia-review.googlesource.com"
- githooks="manifest/git-hooks"/>
</projects>
</manifest>
