diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 20:33:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 20:33:19 +0000 |
| commit | ab9ce6ea5f581e4bad374179b37ea265f7e4908c (patch) | |
| tree | 5b20f76c00f36bde3b61e3751ce03567acc42744 /skia | |
| parent | 64e53aab78faa46eae5266b4760af32f0f8e3bf6 (diff) | |
| download | chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.zip chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.tar.gz chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.tar.bz2 | |
Work on Mac GN build.
This fixes a lot of minor mistakes (mostly missing/extra files and flags) for the Mac GN build.
I separated out some clang flags into a config for extra clang warnings. Several of the third party libraries needed to remove this.
Removes the use_nss flag and uses !use_openssl. This is a result of discussion with rsleevi.
Removes extra duplicate net build file from secondary tree.
ui/gesture_events seems to be getting compiled in GN with more strict warnings than in GYP. Rather than fix this, I fixed the warning in the gesture recognizer unit test. It was returning a const copy (the const is pointless when you're copying).
This also removes a bunch of old GYP integration stuff that was left in the GN build.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/239543013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 25 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 1 |
2 files changed, 20 insertions, 6 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 904e8b8..04919bf 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -74,11 +74,19 @@ config("skia_config") { } } -config("skia_dependent_config") { -} - # Internal-facing config for Skia library code. config("skia_library_config") { + # These include directories are only included for Skia code and are not + # exported to dependents. It's not clear if this is on purpose, but this + # matches the GYP build. + include_dirs = [] + if (is_mac || is_ios) { + include_dirs += [ "//third_party/skia/include/utils/mac" ] + } + if (is_mac) { + include_dirs += [ "//third_party/skia/include/utils/ios" ] + } + defines = [ #skia_export_defines ???) TODO @@ -250,8 +258,6 @@ component("skia") { "//third_party/skia/src/ports/SkOSFile_posix.cpp", "//third_party/skia/src/ports/SkTime_Unix.cpp", "//third_party/skia/src/ports/SkTLS_pthread.cpp", - "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", - "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", ] } else { sources -= [ @@ -277,6 +283,8 @@ component("skia") { } if (!is_linux) { sources -= [ + "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", @@ -302,6 +310,13 @@ component("skia") { ] } + if (is_clang) { + # Skia won't compile with some of the more strict clang warnings. + # e.g. it does: + # SkASSERT(!"sk_out_of_memory"); + configs -= [ "//build/config/clang:extra_warnings" ] + } + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_library_config", diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index a555fff..f5840c5 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -801,7 +801,6 @@ '<(skia_src_path)/utils/debugger/SkDrawCommand.h', '<(skia_src_path)/utils/debugger/SkObjectParser.cpp', '<(skia_src_path)/utils/debugger/SkObjectParser.h', - '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp', '<(skia_src_path)/utils/SkBase64.cpp', '<(skia_src_path)/utils/SkBase64.h', '<(skia_src_path)/utils/SkBitmapHasher.cpp', |