Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: third_party/libwebp/BUILD.gn

Issue 1226583002: clang/win: Build chromium code without -Wno-incompatible-pointer-types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-logical-op-parentheses
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libwebp/BUILD.gn
diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn
index 5495e6460b4fdaf005c5fd8c5d9c0aced0548984..3259ec3fd0e8dacb5de447b434c66f7ee99f3470 100644
--- a/third_party/libwebp/BUILD.gn
+++ b/third_party/libwebp/BUILD.gn
@@ -46,6 +46,9 @@ source_set("libwebp_demux") {
all_dependent_configs = [ ":libwebp_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
+ deps = [
+ ":libwebp_utils",
+ ]
}
source_set("libwebp_dsp") {
@@ -74,7 +77,9 @@ source_set("libwebp_dsp") {
configs += [ "//build/config/compiler:no_chromium_code" ]
all_dependent_configs = [ ":libwebp_config" ]
- deps = []
+ deps = [
+ ":libwebp_utils",
+ ]
if (is_android) {
deps += [ "//third_party/android_tools:cpu_features" ]
}
@@ -151,6 +156,10 @@ source_set("libwebp_enc") {
configs += [ "//build/config/compiler:no_chromium_code" ]
all_dependent_configs = [ ":libwebp_config" ]
+
+ deps = [
+ ":libwebp_utils",
+ ]
}
source_set("libwebp_utils") {
@@ -172,6 +181,14 @@ source_set("libwebp_utils") {
configs += [ "//build/config/compiler:no_chromium_code" ]
all_dependent_configs = [ ":libwebp_config" ]
+
+ config("libwebp_utils_warnings") {
+ if (is_clang) {
+ # See https://code.google.com/p/webp/issues/detail?id=253.
+ cflags = [ "-Wno-incompatible-pointer-types" ]
+ }
+ }
+ public_configs = [ ":libwebp_utils_warnings" ]
}
group("libwebp") {

Powered by Google App Engine
This is Rietveld 408576698