aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-01-29 11:43:21 +0000
committerPavel Labath <labath@google.com>2016-01-29 11:43:21 +0000
commit442b45266d69950f68869ca07c76a106f6c99b45 (patch)
tree061b9c9028b3d65631861e2eb478f2d673e77958
parentonly build dump_syms_mac for x86 hosts (diff)
downloadbreakpad-442b45266d69950f68869ca07c76a106f6c99b45.tar.xz
Improvements to GYP build
This updates the GYP build for the processor component (on windows). - adds/removes references to files which were added or removed from the repository - includes build/common.gypi in the gyp files: needed to correctly detect the OS (I think, the generated MSVC solutions were broken without it) - conditionally compiles code platform-specific code for the given platform After this minidump processor nearly compiles with VS2013: the generated project is correct, but some files still have compilation errors. Disclaimer: I have not tested the GYP changes on non-windows platform, as there does not seem to be anyone using it there. BUG= R=mark@chromium.org Review URL: https://codereview.chromium.org/1643633004 .
-rw-r--r--src/common/common.gyp5
-rw-r--r--src/processor/processor.gyp5
-rw-r--r--src/third_party/libdisasm/libdisasm.gyp3
3 files changed, 10 insertions, 3 deletions
diff --git a/src/common/common.gyp b/src/common/common.gyp
index 5a666de6..177c0938 100644
--- a/src/common/common.gyp
+++ b/src/common/common.gyp
@@ -35,6 +35,11 @@
['OS=="linux"', {
'defines': ['HAVE_A_OUT_H'],
}],
+ ['OS!="android"', {'sources/': [['exclude', '(^|/)android/']]}],
+ ['OS!="linux"', {'sources/': [['exclude', '(^|/)linux/']]}],
+ ['OS!="mac"', {'sources/': [['exclude', '(^|/)mac/']]}],
+ ['OS!="solaris"', {'sources/': [['exclude', '(^|/)solaris/']]}],
+ ['OS!="win"', {'sources/': [['exclude', '(^|/)windows/']]}],
],
},
'targets': [
diff --git a/src/processor/processor.gyp b/src/processor/processor.gyp
index fb3d7cde..2c76925e 100644
--- a/src/processor/processor.gyp
+++ b/src/processor/processor.gyp
@@ -28,6 +28,7 @@
{
'includes': [
+ '../build/common.gypi',
'processor_tools.gypi',
],
'targets': [
@@ -42,8 +43,6 @@
'basic_code_modules.h',
'basic_source_line_resolver.cc',
'basic_source_line_resolver_types.h',
- 'binarystream.cc',
- 'binarystream.h',
'call_stack.cc',
'cfi_frame_info-inl.h',
'cfi_frame_info.cc',
@@ -78,6 +77,7 @@
'pathname_stripper.h',
'postfix_evaluator-inl.h',
'postfix_evaluator.h',
+ 'proc_maps_linux.cc',
'process_state.cc',
'range_map-inl.h',
'range_map.h',
@@ -143,7 +143,6 @@
'sources': [
'address_map_unittest.cc',
'basic_source_line_resolver_unittest.cc',
- 'binarystream_unittest.cc',
'cfi_frame_info_unittest.cc',
'contained_range_map_unittest.cc',
'disassembler_x86_unittest.cc',
diff --git a/src/third_party/libdisasm/libdisasm.gyp b/src/third_party/libdisasm/libdisasm.gyp
index c48ac824..5c8dc458 100644
--- a/src/third_party/libdisasm/libdisasm.gyp
+++ b/src/third_party/libdisasm/libdisasm.gyp
@@ -27,6 +27,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
+ 'includes': [
+ '../../build/common.gypi',
+ ],
'targets': [
{
'target_name': 'libdisasm',