mirror of
https://github.com/chromium/crashpad.git
synced 2025-01-14 01:08:01 +08:00
Nest crashpad and mini_chromum deeper in the external-dependencies build
crashpad and mini_chromium both have top-level “build” directories. These would conflict with top-level “BUILD” files in google3 when checked out on a case-sensitive filesystem. Although Crashpad’s “build” directory can be moved easily, mini_chromium’s matches Chromium’s, which is much more difficult to move. “build” is also the best and most obvious name for these directories. To avoid this problem, in the external-dependencies build, crashpad and mini_chromium are placed one level deeper, just as crashpad is in Chromium, and mini_chromium is in the standalone Crashpad build. This allows true pristine unmodified copies to be checked in to google3, without comingling locally-added files such as BUILD with external source. The directory structure adopted for the external-dependencies build is now root/crashpad/crashpad[/README] root/gmock[/include/gmock/gmock.h] root/gtest[/include/gtest/gtest.h] root/gyp[/pylib/gyp] root/mini_chromium/mini_chromium[/build/common.gypi] Change-Id: Idbc8f1b0d87da0cbceab3c15e059e839c1fb6a3f Reviewed-on: https://chromium-review.googlesource.com/323991 Reviewed-by: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
parent
88eea80ad3
commit
e18f6a6e66
@ -47,7 +47,7 @@ crashpad_dir = (os.path.dirname(script_dir) if script_dir not in ('', os.curdir)
|
||||
sys.path.insert(0,
|
||||
ChooseDependencyPath(os.path.join(crashpad_dir, 'third_party', 'gyp', 'gyp',
|
||||
'pylib'),
|
||||
os.path.join(crashpad_dir, os.pardir, 'gyp',
|
||||
os.path.join(crashpad_dir, os.pardir, os.pardir, 'gyp',
|
||||
'pylib'))[1])
|
||||
|
||||
import gyp
|
||||
@ -62,8 +62,8 @@ def main(args):
|
||||
(dependencies, mini_chromium_dir) = (ChooseDependencyPath(
|
||||
os.path.join(crashpad_dir, 'third_party', 'mini_chromium',
|
||||
'mini_chromium', 'build', 'common.gypi'),
|
||||
os.path.join(crashpad_dir, os.pardir, 'mini_chromium', 'build',
|
||||
'common.gypi')))
|
||||
os.path.join(crashpad_dir, os.pardir, os.pardir, 'mini_chromium',
|
||||
'mini_chromium', 'build', 'common.gypi')))
|
||||
args.extend(['-D', 'crashpad_dependencies=%s' % dependencies])
|
||||
args.extend(['--include', mini_chromium_dir])
|
||||
args.extend(['--depth', crashpad_dir_or_dot])
|
||||
|
2
third_party/gtest/gmock.gyp
vendored
2
third_party/gtest/gmock.gyp
vendored
@ -23,7 +23,7 @@
|
||||
['crashpad_dependencies=="standalone"', {
|
||||
'gmock_dir': 'gtest/googlemock',
|
||||
}, {
|
||||
'gmock_dir': '../../../gmock',
|
||||
'gmock_dir': '../../../../gmock',
|
||||
}],
|
||||
],
|
||||
},
|
||||
|
2
third_party/gtest/gtest.gyp
vendored
2
third_party/gtest/gtest.gyp
vendored
@ -23,7 +23,7 @@
|
||||
['crashpad_dependencies=="standalone"', {
|
||||
'gtest_dir': 'gtest/googletest',
|
||||
}, {
|
||||
'gtest_dir': '../../../gtest',
|
||||
'gtest_dir': '../../../../gtest',
|
||||
}],
|
||||
],
|
||||
},
|
||||
|
4
third_party/mini_chromium/mini_chromium.gyp
vendored
4
third_party/mini_chromium/mini_chromium.gyp
vendored
@ -44,10 +44,10 @@
|
||||
}],
|
||||
['crashpad_dependencies=="external"', {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/../mini_chromium/base/base.gyp:base',
|
||||
'../../../../mini_chromium/mini_chromium/base/base.gyp:base',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'<(DEPTH)/../mini_chromium/base/base.gyp:base',
|
||||
'../../../../mini_chromium/mini_chromium/base/base.gyp:base',
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
Loading…
x
Reference in New Issue
Block a user