3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuchsia: Update expected mini_chromium location for in-Fuchsia build

Browse Source 
The initial plan was to have crashpad and mini_chromium be siblings in
the Fuchsia tree, but the Fuchsia team sensibly preferred to nest
mini_chromium inside Crashpad
https://fuchsia-review.googlesource.com/c/garnet/+/115120, so update the
expected location to match. Conveniently this is where mini_chromium
lives in a normal standalone build too.

Bug: crashpad:196
Change-Id: Iedab0dd557fa248c6419380b676b71427279bba1
Reviewed-on: https://chromium-review.googlesource.com/883569
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Scott Graham 2018-01-24 10:41:24 -08:00 committed by Commit Bot
parent c56e854984
commit 7e7193d5f1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/crashpad_buildconfig.gni
View File

@ -46,15 +46,10 @@ if (crashpad_is_in_chromium) {
crashpad_is_clang = is_clang
} else {
# Using mini_chromium, but in different locations depending on whether in
# Fuchsia, or standalone.
if (crashpad_is_in_fuchsia) {
import("//third_party/mini_chromium/build/compiler.gni")
import("//third_party/mini_chromium/build/platform.gni")
} else {
import("../third_party/mini_chromium/mini_chromium/build/compiler.gni")
import("../third_party/mini_chromium/mini_chromium/build/platform.gni")
}
# Both standalone and in Fuchsia tree use mini_chromium, and it's mapped into
# the same location in both cases.
import("../third_party/mini_chromium/mini_chromium/build/compiler.gni")
import("../third_party/mini_chromium/mini_chromium/build/platform.gni")
crashpad_is_mac = mini_chromium_is_mac
crashpad_is_win = mini_chromium_is_win
crashpad_is_linux = mini_chromium_is_linux