AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[tracing] Add no_chromium_code config and suppress warning in protobuf

Browse Source 
Add no_chromium_code config - this is required when removing the
chromium_code config.

Fix a warning that occurs when compiling protobuf_full by suppressing
warnings for not marking overriding functions with override.

Change-Id: I7f71a24b95dc3ef7d327481581aaa217407ee2cf
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1569441
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60894}
This commit is contained in:
Peter Marshall 2019-04-16 17:07:29 +02:00 committed by Commit Bot
parent 66ed7761b3
commit d1c7007984
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BUILD.gn
View File

@ -4323,6 +4323,9 @@ if (!build_with_chromium && v8_use_perfetto) {
defines = [ "HAVE_PTHREAD=1" ]
if (is_clang) {
cflags = [
"-Wno-unused-private-field",
"-Wno-unused-function",
"-Wno-inconsistent-missing-override",
"-Wno-unknown-warning-option",
"-Wno-enum-compare-switch",
"-Wno-user-defined-warnings",
@ -4359,7 +4362,10 @@ if (!build_with_chromium && v8_use_perfetto) {
"third_party/protobuf/src/google/protobuf/wire_format_lite.cc",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ ":protobuf_config" ]
configs += [
"//build/config/compiler:no_chromium_code",
":protobuf_config",
]
public_configs = [ ":protobuf_gen_config" ]
}
@ -4425,7 +4431,10 @@ if (!build_with_chromium && v8_use_perfetto) {
"third_party/protobuf/src/google/protobuf/wrappers.pb.cc",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ ":protobuf_config" ]
configs += [
"//build/config/compiler:no_chromium_code",
":protobuf_config",
]
public_configs = [ ":protobuf_gen_config" ]
}
@ -4518,7 +4527,10 @@ if (!build_with_chromium && v8_use_perfetto) {
"third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ ":protobuf_config" ]
configs += [
"//build/config/compiler:no_chromium_code",
":protobuf_config",
]
public_configs = [ ":protobuf_gen_config" ]
}
@ -4531,6 +4543,7 @@ if (!build_with_chromium && v8_use_perfetto) {
"third_party/protobuf/src/google/protobuf/compiler/main.cc",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
}
} # host_toolchain
} # if (!build_with_chromium && v8_use_perfetto)