From e6b525a4be28bd0ec684bd0dff7452cff53b241f Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Wed, 23 Sep 2020 14:39:45 -0700 Subject: [PATCH] Update config adjustments for moved build config in mini_chromium 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 --- DEPS | 2 +- build/BUILD.gn | 2 +- build/BUILDCONFIG.gn | 17 +++++++++-------- handler/BUILD.gn | 10 ++++++---- third_party/googletest/BUILD.gn | 10 +++++----- third_party/zlib/BUILD.gn | 7 ++----- util/BUILD.gn | 5 ++--- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/DEPS b/DEPS index 83995e0c..f0ccc633 100644 --- a/DEPS +++ b/DEPS @@ -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', diff --git a/build/BUILD.gn b/build/BUILD.gn index 6e6ccd64..9f959ec9 100644 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -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" ] } } diff --git a/build/BUILDCONFIG.gn b/build/BUILDCONFIG.gn index 991d2a73..d40a6ad2 100644 --- a/build/BUILDCONFIG.gn +++ b/build/BUILDCONFIG.gn @@ -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") { diff --git a/handler/BUILD.gn b/handler/BUILD.gn index 332117d7..0eab2ff9 100644 --- a/handler/BUILD.gn +++ b/handler/BUILD.gn @@ -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", + ] } } diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 02cd9b88..4ad44a43 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -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", diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index 24fc742e..5cbd8653 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -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") { diff --git a/util/BUILD.gn b/util/BUILD.gn index 0ce83599..3a26c6e8 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -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) {