summaryrefslogtreecommitdiffstats
path: root/components/device_event_log.gypi
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-03-16 15:14:18 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-16 22:15:03 +0000
commit8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5 (patch)
tree22106f2d87ed7e07acab521a2e9f8423944e9f5e /components/device_event_log.gypi
parent042582e3d43600e5aa88feffd72ccf48fc2c047f (diff)
downloadchromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.zip
chromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.tar.gz
chromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.tar.bz2
Fix some GN component build issues.
This fixes some files not compiling with the proper flags for component mode. The device_event_log target in GN is a source set in GN and a component in GYP. This difference was causing some errors. I changed this to be a static library in GYP. It only has 2 files in it so making a whole shared library for this target seems wasteful. Review URL: https://codereview.chromium.org/1011823002 Cr-Commit-Position: refs/heads/master@{#320805}
Diffstat (limited to 'components/device_event_log.gypi')
-rw-r--r--components/device_event_log.gypi5
1 files changed, 1 insertions, 4 deletions
diff --git a/components/device_event_log.gypi b/components/device_event_log.gypi
index 09eda0e..0334e8a 100644
--- a/components/device_event_log.gypi
+++ b/components/device_event_log.gypi
@@ -6,7 +6,7 @@
'targets': [
{
'target_name': 'device_event_log_component',
- 'type': '<(component)',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../net/net.gyp:net',
@@ -14,9 +14,6 @@
'include_dirs': [
'..',
],
- 'defines': [
- 'DEVICE_EVENT_LOG_IMPLEMENTATION',
- ],
'sources': [
'device_event_log/device_event_log.cc',
'device_event_log/device_event_log.h',