mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-27 15:32:10 +08:00
gn: Fix a couple of things after 9465fc72ad90 and 2bb56fafe3bd
When I redid the Crashpad GN build a few weeks ago (https://chromium-review.googlesource.com/c/chromium/src/+/751403), I tried to order things according to the GN style guide (https://chromium.googlesource.com/chromium/src/tools/gn/+/HEAD/docs/style_guide.md). As for conditionals, I tried to stick to doing a set of conditionals after “sources” for just “sources”, and then another one at the bottom for everything else. It turns out that this was a good idea because it’s an error to say “deps += [something]” inside a conditional until you’ve already said “deps = [something_else]” first. (Maybe that’s why I did it.) 9465fc72ad90 regressed this. 2bb56fafe3bd also left behind a couple of straggler paths that were absolute to Chromium’s root but should have been made relative. This also fixes a comment (about something that won’t yet work outside of Chromium anyway, but still…) Bug: crashpad:79 Change-Id: I8a6f84bfad368cbcdae4fbff11f1d00e2af14b93 Reviewed-on: https://chromium-review.googlesource.com/798172 Commit-Queue: Mark Mentovai <mark@chromium.org> Reviewed-by: Scott Graham <scottmg@chromium.org>
This commit is contained in:
parent
9465fc72ad
commit
d25b0242c6
@ -74,9 +74,9 @@ static_library("compat") {
|
||||
deps = []
|
||||
|
||||
if (is_mac) {
|
||||
deps += [ "//third_party/crashpad/crashpad/third_party/apple_cctools" ]
|
||||
deps += [ "../third_party/apple_cctools" ]
|
||||
}
|
||||
if (is_win) {
|
||||
deps += [ "//third_party/crashpad/crashpad/third_party/getopt" ]
|
||||
deps += [ "../third_party/getopt" ]
|
||||
}
|
||||
}
|
||||
|
@ -47,8 +47,6 @@ static_library("test") {
|
||||
]
|
||||
|
||||
if (is_mac) {
|
||||
libs = [ "bsm" ]
|
||||
deps += [ "//third_party/crashpad/crashpad/handler" ]
|
||||
sources += [
|
||||
"mac/dyld.cc",
|
||||
"mac/dyld.h",
|
||||
@ -89,6 +87,11 @@ static_library("test") {
|
||||
"//base",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
if (is_mac) {
|
||||
libs = [ "bsm" ]
|
||||
deps += [ "../handler" ]
|
||||
}
|
||||
}
|
||||
|
||||
source_set("test_test") {
|
||||
|
@ -297,7 +297,7 @@ static_library("util") {
|
||||
|
||||
public_configs = [ "..:crashpad_config" ]
|
||||
|
||||
# Include files from here and generated files starting with "util".
|
||||
# Include generated files starting with "util".
|
||||
include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ]
|
||||
|
||||
public_deps = [
|
||||
|
Loading…
x
Reference in New Issue
Block a user