summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-21 20:54:51 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-21 20:54:51 +0000
commite8ab6916b28405fde641e7179f5e00d371c1ab97 (patch)
treef02c7f359dde759966f083d8c2d96caefc30ff46 /skia
parent2ac8e51c88cf36713b6eae6628b4123bdbc6803f (diff)
downloadchromium_src-e8ab6916b28405fde641e7179f5e00d371c1ab97.zip
chromium_src-e8ab6916b28405fde641e7179f5e00d371c1ab97.tar.gz
chromium_src-e8ab6916b28405fde641e7179f5e00d371c1ab97.tar.bz2
Make GN build work on Mac again.
This adds extension detection for lower-case ".s" assembly files (used in NSPR) in addition to the existing handling of uppercase ".S" ones. Minor fixes for build files for Mac for dependencies and files. Proper handling of USE_NSS and addition of USE_OPENSSL_CERTS that match the GYP build. R=rsleevi@chromium.org Review URL: https://codereview.chromium.org/242173002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia_gn_files.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
index e06bf0e..3fe7fa0 100644
--- a/skia/skia_gn_files.gypi
+++ b/skia/skia_gn_files.gypi
@@ -858,6 +858,7 @@
#mac
'<(skia_include_path)/utils/mac/SkCGUtils.h',
'<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp',
+ '<(skia_src_path)/utils/mac/SkStream_mac.cpp',
#windows
'<(skia_include_path)/utils/win/SkAutoCoInitialize.h',