diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-28 09:58:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-28 09:58:44 -0700 |
| commit | 0634317cbe50f5dd21e7e78da59cb2dba0edcae4 (patch) | |
| tree | f0fc53ea22813af404f50388a49322ed0e7c89bc | |
| parent | eae6a9127707b9391546012d11bcc7d9920dfa6d (diff) | |
GN: fix mac build again
Hoping to land these using the other GN bots as trybots.
Don't know what magic was letting us get to webp's headers yesterday on Linux. Might have been using /usr/include's ?
The other change is the difference between some setups using #define SK_BUILD_FOR_MAC and others #define SK_BUILD_FOR_MAC 1. We want either to mean "we're Mac".
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2190713004
Review-Url: https://codereview.chromium.org/2190713004
| -rw-r--r-- | third_party/libwebp/BUILD.gn | 2 | ||||
| -rw-r--r-- | tools/flags/SkCommandLineFlags.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn index 99bf5469c6..1ad734fe0b 100644 --- a/third_party/libwebp/BUILD.gn +++ b/third_party/libwebp/BUILD.gn @@ -9,7 +9,7 @@ declare_args() { import("../third_party.gni") third_party("libwebp") { - public_include_dirs = [ "../externals/libwebp" ] + public_include_dirs = [ "../externals/libwebp/src" ] sources = [ "../externals/libwebp/src/dec/alpha.c", diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp index 9205f47c72..fd7c8ff09b 100644 --- a/tools/flags/SkCommandLineFlags.cpp +++ b/tools/flags/SkCommandLineFlags.cpp @@ -335,7 +335,7 @@ void SkCommandLineFlags::Parse(int argc, char** argv) { flag = flag->next(); } if (!flagMatched) { -#if SK_BUILD_FOR_MAC +#if defined(SK_BUILD_FOR_MAC) if (SkStrStartsWith(argv[i], "NSDocumentRevisions") || SkStrStartsWith(argv[i], "-NSDocumentRevisions")) { i++; // skip YES |