AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll testing expat to tip of tree.

Browse Source 
We currently mirror Android's mirror, which is out of date and only
rolled to tagged revisions. Roll to Chromium's mirror which is actually
up to date.

Change-Id: I754dc58149526e0c820bd7bcff1693d2d851a084
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282039
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2020-04-07 10:21:35 -04:00 committed by Skia Commit-Bot
parent 9b5e16c09e
commit b1acff60fb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -17,7 +17,7 @@ deps = {
"third_party/externals/shaderc" : "https://chromium.googlesource.com/external/github.com/google/shaderc@1926de0638b6dd74b759293a5bd21c473d0b1ade",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a",
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@e976867fb57a0cd87e3b0fe05d59e0ed63c6febb",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@0a3d2bb99b45b72e1d45185ab054efa993d97210",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@3a74ee528255cc027d84b204a87b5c25e47bff79",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@dbd3825b31041d782c5b504c59dcfb5ac7dda08c",

14
third_party/expat/BUILD.gn vendored
View File

@ -16,14 +16,18 @@ if (skia_use_system_expat) {
} else {
third_party("expat") {
public_defines = [ "XML_STATIC" ]
public_include_dirs = [ "../externals/expat/lib" ]
public_include_dirs = [ "../externals/expat/expat/lib" ]
defines = [ "HAVE_MEMMOVE" ]
defines = [
"HAVE_MEMMOVE",
"XML_DEV_URANDOM",
]
sources = [
"../externals/expat/lib/xmlparse.c",
"../externals/expat/lib/xmlrole.c",
"../externals/expat/lib/xmltok.c",
"../externals/expat/expat/lib/expat.h",
"../externals/expat/expat/lib/xmlparse.c",
"../externals/expat/expat/lib/xmlrole.c",
"../externals/expat/expat/lib/xmltok.c",
]
}
}