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

GN: fix mac build again

Browse Source 
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
This commit is contained in:
mtklein 2016-07-28 09:58:44 -07:00 committed by Commit bot
parent eae6a91277
commit 0634317cbe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/libwebp/BUILD.gn vendored
View File

@ -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",

2
tools/flags/SkCommandLineFlags.cpp
View File

@ -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