diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 21:53:09 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 21:53:09 +0000 |
| commit | 1bbdb52ce17b6a46ff230ecb27fea5c9ecdbfae3 (patch) | |
| tree | a05247484966290ee20050ff5c2c39a7cca889ac | |
| parent | 55e1899ad566c8292ab54c780625f13c5a7f60e5 (diff) | |
| download | chromium_src-1bbdb52ce17b6a46ff230ecb27fea5c9ecdbfae3.zip chromium_src-1bbdb52ce17b6a46ff230ecb27fea5c9ecdbfae3.tar.gz chromium_src-1bbdb52ce17b6a46ff230ecb27fea5c9ecdbfae3.tar.bz2 | |
Fix most GN clang errors.
Finally enabling Clang requires openssl and hunspell rolls. This should
fix everything else.
R=dalecurtis@chromium.org
Review URL: https://codereview.chromium.org/402683003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283894 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | breakpad/BUILD.gn | 5 | ||||
| -rw-r--r-- | media/audio/pulse/audio_manager_pulse.cc | 2 | ||||
| -rw-r--r-- | third_party/opus/BUILD.gn | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 2c0ae49..53454ac 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -420,6 +420,8 @@ if (is_linux && current_toolchain == host_toolchain) { "src/common/string_conversion.h", ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":breakpad_client_config" ] # Android NDK toolchain doesn't support -mimplicit-it=always @@ -551,7 +553,8 @@ if (is_linux && current_toolchain == host_toolchain) { ] # This file has an unused variable warning. - cflags = [ "-Wno-unused-variable" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":breakpad_client" ] diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc index f795129..03ff17d 100644 --- a/media/audio/pulse/audio_manager_pulse.cc +++ b/media/audio/pulse/audio_manager_pulse.cc @@ -42,8 +42,10 @@ static const int kMaximumOutputBufferSize = 8192; // Default input buffer size. static const int kDefaultInputBufferSize = 1024; +#if defined(DLOPEN_PULSEAUDIO) static const base::FilePath::CharType kPulseLib[] = FILE_PATH_LITERAL("libpulse.so.0"); +#endif // static AudioManager* AudioManagerPulse::Create(AudioLogFactory* audio_log_factory) { diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn index cdf400c58..6f4a584 100644 --- a/third_party/opus/BUILD.gn +++ b/third_party/opus/BUILD.gn @@ -53,6 +53,8 @@ source_set("opus") { "src/silk", ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":opus_config" ] if (is_win) { @@ -141,6 +143,9 @@ executable("opus_demo") { "src/src/opus_demo.c", ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + include_dirs = [ "src/celt", "src/silk", |