3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-26 23:01:05 +08:00
Code Issues Projects Releases Wiki Activity

Update config adjustments for moved build config in mini_chromium

Browse Source 
Includes DEPS roll of mini_chromium:
f0bd14b Pull build_config.h source set into separate build file
65fb5c9 Update path to win_helper after moving to build/config

Change-Id: Ic9f5c68e2cebd8bf86492766684bdb422da1aa9e
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2426989
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Scott Graham 2020-09-23 14:39:45 -07:00
parent 865ba27672
commit e6b525a4be
7 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -42,7 +42,7 @@ deps = {
'7bde79cc274d06451bf65ae82c012a5d3e476b5a',
'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' +
'76a9bb7475f6217eaf108789246379d3972b4e6a',
'65fb5c9430cd7b333071b967284cece54f5929de',
'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020',

2
build/BUILD.gn
View File

@ -52,7 +52,7 @@ if (crashpad_is_ios) {
public_configs = [ "//build/config/compiler:enable_arc" ]
} else if (crashpad_is_standalone) {
public_configs =
[ "//third_party/mini_chromium/mini_chromium/build:ios_enable_arc" ]
[ "//third_party/mini_chromium/mini_chromium/build/config:ios_enable_arc" ]
}
}

17
build/BUILDCONFIG.gn
View File

@ -42,9 +42,10 @@ if (crashpad_is_standalone) {
}
if (current_os == "win") {
set_default_toolchain("$_mini_chromium_dir/build:msvc_toolchain_$current_cpu")
set_default_toolchain(
"$_mini_chromium_dir/build/config:msvc_toolchain_$current_cpu")
} else {
set_default_toolchain("$_mini_chromium_dir/build:gcc_like_toolchain")
set_default_toolchain("$_mini_chromium_dir/build/config:gcc_like_toolchain")
}
declare_args() {
@ -59,18 +60,18 @@ declare_args() {
}
_default_configs = [
"$_mini_chromium_dir/build:default",
"$_mini_chromium_dir/build:Wexit_time_destructors",
"$_mini_chromium_dir/build:Wimplicit_fallthrough",
"$_mini_chromium_dir/build/config:default",
"$_mini_chromium_dir/build/config:Wexit_time_destructors",
"$_mini_chromium_dir/build/config:Wimplicit_fallthrough",
]
if (crashpad_use_libfuzzer) {
_default_configs += [ "//build:crashpad_fuzzer_flags" ]
_default_configs += [ "//build/config:crashpad_fuzzer_flags" ]
}
_default_executable_configs = _default_configs + [
"$_mini_chromium_dir/build:executable",
"$_mini_chromium_dir/build:win_console",
"$_mini_chromium_dir/build/config:executable",
"$_mini_chromium_dir/build/config:win_console",
]
set_defaults("source_set") {

10
handler/BUILD.gn
View File

@ -150,10 +150,12 @@ if (!crashpad_is_ios) {
remove_configs = [ "//build/config/win:console" ]
configs = [ "//build/config/win:windowed" ]
} else {
remove_configs =
[ "//third_party/mini_chromium/mini_chromium/build:win_console" ]
configs =
[ "//third_party/mini_chromium/mini_chromium/build:win_windowed" ]
remove_configs = [
"//third_party/mini_chromium/mini_chromium/build/config:win_console",
]
configs = [
"//third_party/mini_chromium/mini_chromium/build/config:win_windowed",
]
}
}

10
third_party/googletest/BUILD.gn vendored
View File

@ -91,7 +91,7 @@ if (crashpad_is_in_chromium) {
]
sources -= [ "$googletest_dir/googletest/src/gtest-all.cc" ]
public_configs = [ ":googletest_public_config" ]
configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
configs += [ ":googletest_private_config" ]
if (crashpad_is_fuchsia) {
deps = [ "../fuchsia" ]
@ -127,7 +127,7 @@ if (crashpad_is_in_chromium) {
"$googletest_dir/googletest/test/production.cc",
"$googletest_dir/googletest/test/production.h",
]
configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
configs += [ ":googletest_private_config" ]
deps = [
":googletest",
@ -166,7 +166,7 @@ if (crashpad_is_in_chromium) {
"$googletest_dir/googletest/test/googletest-param-test-test.h",
"$googletest_dir/googletest/test/googletest-param-test2-test.cc",
]
configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
configs += [ ":googletest_private_config" ]
deps = [ ":googletest" ]
@ -282,7 +282,7 @@ if (crashpad_is_in_chromium) {
]
sources -= [ "$googletest_dir/googlemock/src/gmock-all.cc" ]
public_configs = [ ":googlemock_public_config" ]
configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
configs += [ ":googlemock_private_config" ]
deps = [ ":googletest" ]
}
@ -350,7 +350,7 @@ if (crashpad_is_in_chromium) {
test("gmock_stress_test") {
sources = [ "$googletest_dir/googlemock/test/gmock_stress_test.cc" ]
configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
configs += [ ":googlemock_private_config" ]
deps = [
":googlemock",

7
third_party/zlib/BUILD.gn vendored
View File

@ -113,12 +113,9 @@ if (zlib_source == "external") {
}
if (crashpad_is_standalone) {
configs -= [
"//third_party/mini_chromium/mini_chromium/build:Wimplicit_fallthrough",
]
configs -= [ "//third_party/mini_chromium/mini_chromium/build/config:Wimplicit_fallthrough" ]
} else if (crashpad_is_external) {
configs -=
[ "//../../mini_chromium/mini_chromium/build:Wimplicit_fallthrough" ]
configs -= [ "//../../mini_chromium/mini_chromium/build/config:Wimplicit_fallthrough" ]
}
if (zlib_source == "embedded") {

5
util/BUILD.gn
View File

@ -640,10 +640,9 @@ if (!crashpad_is_android && !crashpad_is_ios) {
]
if (crashpad_is_standalone) {
remove_configs = [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ]
remove_configs = [ "//third_party/mini_chromium/mini_chromium/build/config:Wexit_time_destructors" ]
} else if (crashpad_is_external) {
remove_configs =
[ "//../../mini_chromium/mini_chromium/build:Wexit_time_destructors" ]
remove_configs = [ "//../../mini_chromium/mini_chromium/build/config:Wexit_time_destructors" ]
}
if (crashpad_is_win) {