author | Chris Manchester <cmanchester@mozilla.com> |
Wed, 20 Sep 2017 12:43:24 -0700 | |
changeset 431613 | ae4d0410545f5a85746dc7869e48b386f13b7032 |
parent 431612 | 9b5a00094c49b9b85e1fb5ff13921c52a1975cd0 |
child 431614 | e4ac1e17ffe51b34721a569b259d57cb6f965628 |
push id | 7785 |
push user | ryanvm@gmail.com |
push date | Thu, 21 Sep 2017 13:39:55 +0000 |
treeherder | mozilla-beta@06d4034a8a03 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1398897 |
milestone | 57.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/python/mozbuild/mozbuild/compilation/database.py +++ b/python/mozbuild/mozbuild/compilation/database.py @@ -49,18 +49,17 @@ class CompileDBBackend(CommonBackend): self._gyp_dirs = set() def consume_object(self, obj): # Those are difficult directories, that will be handled later. if obj.relativedir in ( 'build/unix/elfhack', 'build/unix/elfhack/inject', 'build/clang-plugin', - 'build/clang-plugin/tests', - 'toolkit/crashreporter/google-breakpad/src/common'): + 'build/clang-plugin/tests'): return True consumed = CommonBackend.consume_object(self, obj) if consumed: return True if isinstance(obj, DirectoryTraversal):
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -59,14 +59,18 @@ if CONFIG['OS_TARGET'] == 'Android': 'android/breakpad_getcontext.S', ] LOCAL_INCLUDES += [ '/toolkit/crashreporter/google-breakpad/src/common/android/include', ] Library('breakpad_common_s') +# memory.h in this dir breaks things if -I$(srcdir) gets added, since memory.h +# is also a system header and the copy here winds up getting included instead. +COMPILE_FLAGS['BASE_INCLUDES'] = [] + # We allow warnings for third-party code that can be updated from upstream. ALLOW_COMPILER_WARNINGS = True FINAL_LIBRARY = 'xul' include('/toolkit/crashreporter/crashreporter.mozbuild')