Skip to content

Commit 2853b84

Browse files
authored
Merge pull request #27 from aaaapai/up
Up
2 parents 2489969 + 966a044 commit 2853b84

512 files changed

Lines changed: 39453 additions & 8691 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
/third_party/dawn
5151
/third_party/depot_tools
5252
/third_party/EGL-Registry/src
53+
/third_party/expat/src
5354
/third_party/flatbuffers/src
5455
/third_party/fuchsia-sdk
5556
/third_party/gles1_conform
@@ -104,7 +105,8 @@
104105
/third_party/vulkan-utility-libraries/src
105106
/third_party/vulkan-validation-layers/src
106107
/third_party/vulkan_memory_allocator
107-
/third_party/wayland
108+
/third_party/wayland/src
109+
/third_party/wayland-protocols/src
108110
/third_party/zlib
109111
/tools/android
110112
/tools/clang

.gitmodules

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@
251251
path = third_party/vulkan_memory_allocator
252252
url = https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
253253
gclient-condition = not build_with_chromium
254-
[submodule "third_party/wayland"]
255-
path = third_party/wayland
256-
url = https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland
257-
gclient-condition = not build_with_chromium and host_os == "linux"
258254
[submodule "third_party/zlib"]
259255
path = third_party/zlib
260256
url = https://chromium.googlesource.com/chromium/src/third_party/zlib
@@ -303,3 +299,15 @@
303299
path = tools/win
304300
url = https://chromium.googlesource.com/chromium/src/tools/win
305301
gclient-condition = checkout_win and not build_with_chromium
302+
[submodule "third_party/wayland/src"]
303+
path = third_party/wayland/src
304+
url = https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland
305+
gclient-condition = not build_with_chromium and host_os == "linux"
306+
[submodule "third_party/wayland-protocols/src"]
307+
path = third_party/wayland-protocols/src
308+
url = https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols
309+
gclient-condition = not build_with_chromium and host_os == "linux"
310+
[submodule "third_party/expat/src"]
311+
path = third_party/expat/src
312+
url = https://chromium.googlesource.com/external/github.com/libexpat/libexpat
313+
gclient-condition = not build_with_chromium and host_os == "linux"

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,6 @@ Hongchen Yan
8989
Andrew Sumsion
9090
Swapnadeep Som
9191
Jérôme Lécuyer
92+
Edward Lee
93+
Dianda Lin
94+
Joel Winarske

0 commit comments

Comments
 (0)