compat.gyp: use type=none for header-only target

On Linux and macOS, compat.gyp:crashpad_compat is a header-only target,
which should be declared type=none.

This CL also adds the missing non_mac/ include_dirs for non-macOS
targets.

Bug: crashpad:
Change-Id: I7bef32e8f6bdcb86f51118a1bb1d3b52d05120d1
Reviewed-on: https://chromium-review.googlesource.com/1124773
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Charly Delay 2018-07-03 15:01:12 -04:00 committed by Commit Bot
parent aabc485b64
commit 038ba6eea2

View File

@ -19,7 +19,6 @@
'targets': [ 'targets': [
{ {
'target_name': 'crashpad_compat', 'target_name': 'crashpad_compat',
'type': 'static_library',
'sources': [ 'sources': [
'android/dlfcn_internal.cc', 'android/dlfcn_internal.cc',
'android/dlfcn_internal.h', 'android/dlfcn_internal.h',
@ -63,6 +62,7 @@
], ],
'conditions': [ 'conditions': [
['OS=="mac"', { ['OS=="mac"', {
'type': 'none',
'include_dirs': [ 'include_dirs': [
'mac', 'mac',
], ],
@ -71,8 +71,18 @@
'mac', 'mac',
], ],
}, },
}, {
'include_dirs': [
'non_mac',
],
'direct_dependent_settings': {
'include_dirs': [
'non_mac',
],
},
}], }],
['OS=="win"', { ['OS=="win"', {
'type': 'static_library',
'include_dirs': [ 'include_dirs': [
'win', 'win',
], ],
@ -95,6 +105,7 @@
}, },
}], }],
['OS=="android"', { ['OS=="android"', {
'type': 'static_library',
'include_dirs': [ 'include_dirs': [
'android', 'android',
'linux', 'linux',
@ -112,6 +123,7 @@
}, },
}], }],
['OS=="linux"', { ['OS=="linux"', {
'type': 'none',
'include_dirs': [ 'include_dirs': [
'linux', 'linux',
], ],