[SkQP/Android] Replace -Weverything with -Wextra
-Weverything is not recommended, use -Wextra. CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86-devrel-Android_SKQP,Test-Debian9-Clang-NUC7i5BNK-CPU-Emulator-x86-devrel-All-Android_SKQP Bug: b/143713277 Test: mma Change-Id: Ibaca86bd52348d544a8109b25ae013001444935d Reviewd-on: https://android-review.googlesource.com/1163299 Cherry-pick: 29cd4eca88df5fafde51ee9a50e3deb96263fc64 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253956 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
parent
a87c52991b
commit
654eb2ad04
16
BUILD.gn
16
BUILD.gn
@ -2015,7 +2015,13 @@ if (skia_enable_tools) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!is_win) {
|
if (!is_win) {
|
||||||
test_lib("skqp_lib") {
|
source_set("skqp_lib") {
|
||||||
|
check_includes = false
|
||||||
|
testonly = true
|
||||||
|
if (!is_official_build) {
|
||||||
|
configs -= [ "//gn:warnings" ]
|
||||||
|
}
|
||||||
|
public_configs = [ ":skia_private" ]
|
||||||
defines =
|
defines =
|
||||||
[ "SK_SKQP_GLOBAL_ERROR_TOLERANCE=$skia_skqp_global_error_tolerance" ]
|
[ "SK_SKQP_GLOBAL_ERROR_TOLERANCE=$skia_skqp_global_error_tolerance" ]
|
||||||
sources = [
|
sources = [
|
||||||
@ -2053,8 +2059,12 @@ if (skia_enable_tools) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
test_app("skqp_app") {
|
shared_library("libskqp_app") {
|
||||||
is_shared_library = true
|
configs += [ ":skia_private" ]
|
||||||
|
if (!is_official_build) {
|
||||||
|
configs -= [ "//gn:warnings" ]
|
||||||
|
}
|
||||||
|
testonly = true
|
||||||
sources = [
|
sources = [
|
||||||
"tools/skqp/src/jni_skqp.cpp",
|
"tools/skqp/src/jni_skqp.cpp",
|
||||||
]
|
]
|
||||||
|
@ -149,6 +149,9 @@ defines = {str(d) for d in js['targets']['//:libskqp_app']['defines']}
|
|||||||
defines.update(["SK_ENABLE_DUMP_GPU", "SK_BUILD_FOR_SKQP"])
|
defines.update(["SK_ENABLE_DUMP_GPU", "SK_BUILD_FOR_SKQP"])
|
||||||
cflags_cc.update(['-Wno-extra-semi-stmt'])
|
cflags_cc.update(['-Wno-extra-semi-stmt'])
|
||||||
|
|
||||||
|
# Android does not want -Weverything set, it blocks toolchain updates.
|
||||||
|
assert '-Weverything' not in cflags
|
||||||
|
|
||||||
gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None)
|
gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None)
|
||||||
gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs',
|
gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs',
|
||||||
local_includes, 'freetype')
|
local_includes, 'freetype')
|
||||||
|
Loading…
Reference in New Issue
Block a user