mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-28 07:48:14 +08:00
fuchsia: Various build fixes for building in Fuchsia tree
- Use "deprecated_system_image" (merging from downstream) - Add package for crashpad_handler - Depend on launchpad target instead of a lib when in tree, as launchpad is no longer in the sysroot. - Don't try to remove the -Wexit_time_destructors unless building standalone, when it's added by mini_chromiums BUILDCONFIG.gn Bug: crashpad:196 Change-Id: I08e0faaa989346b078a41896eb4ace69e7b1bcdc Reviewed-on: https://chromium-review.googlesource.com/1026514 Reviewed-by: Joshua Peraza <jperaza@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
parent
0e144fb9ae
commit
7274c9823f
10
BUILD.gn
10
BUILD.gn
@ -36,7 +36,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
|
|||||||
import("//build/package.gni")
|
import("//build/package.gni")
|
||||||
package("crashpad_test") {
|
package("crashpad_test") {
|
||||||
testonly = true
|
testonly = true
|
||||||
system_image = true
|
deprecated_system_image = true
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":crashpad_tests",
|
":crashpad_tests",
|
||||||
@ -48,6 +48,14 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package("crashpad_handler") {
|
||||||
|
deprecated_system_image = true
|
||||||
|
|
||||||
|
deps = [
|
||||||
|
"handler:crashpad_handler",
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (crashpad_is_standalone) {
|
} else if (crashpad_is_standalone) {
|
||||||
test("crashpad_client_test") {
|
test("crashpad_client_test") {
|
||||||
|
@ -125,7 +125,13 @@ static_library("test") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (crashpad_is_fuchsia) {
|
if (crashpad_is_fuchsia) {
|
||||||
libs = [ "launchpad" ]
|
if (crashpad_is_in_fuchsia) {
|
||||||
|
deps += [
|
||||||
|
"//zircon/public/lib/launchpad",
|
||||||
|
]
|
||||||
|
} else {
|
||||||
|
libs = [ "launchpad" ]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -462,9 +462,11 @@ crashpad_executable("http_transport_test_server") {
|
|||||||
"../tools:tool_support",
|
"../tools:tool_support",
|
||||||
]
|
]
|
||||||
|
|
||||||
remove_configs = [
|
if (crashpad_is_standalone) {
|
||||||
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
|
remove_configs = [
|
||||||
]
|
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
if (crashpad_is_win) {
|
if (crashpad_is_win) {
|
||||||
libs = [ "ws2_32.lib" ]
|
libs = [ "ws2_32.lib" ]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user