Index: content/content_browser.gypi |
diff --git a/content/content_browser.gypi b/content/content_browser.gypi |
index 74c92137ad5c4ccb344a6237fdb97210ba80ee68..dbae33e58cd90892094f1d0334703ff7cfa05d70 100644 |
--- a/content/content_browser.gypi |
+++ b/content/content_browser.gypi |
@@ -8,6 +8,8 @@ |
'../crypto/crypto.gyp:crypto', |
'../device/battery/battery.gyp:device_battery', |
'../device/battery/battery.gyp:device_battery_mojo_bindings', |
+ '../device/device_sensors/device_sensors.gyp:device_device_sensors', |
+ '../device/device_sensors/device_sensors.gyp:device_device_sensors_mojo_bindings', |
'../device/vibration/vibration.gyp:device_vibration', |
'../device/vibration/vibration.gyp:device_vibration_mojo_bindings', |
'../google_apis/google_apis.gyp:google_apis', |
@@ -500,29 +502,6 @@ |
'browser/device_monitor_mac.mm', |
'browser/device_monitor_udev.cc', |
'browser/device_monitor_udev.h', |
- 'browser/device_sensors/ambient_light_mac.cc', |
- 'browser/device_sensors/ambient_light_mac.h', |
- 'browser/device_sensors/data_fetcher_shared_memory.h', |
- 'browser/device_sensors/data_fetcher_shared_memory_android.cc', |
- 'browser/device_sensors/data_fetcher_shared_memory_base.cc', |
- 'browser/device_sensors/data_fetcher_shared_memory_base.h', |
- 'browser/device_sensors/data_fetcher_shared_memory_chromeos.cc', |
- 'browser/device_sensors/data_fetcher_shared_memory_default.cc', |
- 'browser/device_sensors/data_fetcher_shared_memory_mac.cc', |
- 'browser/device_sensors/data_fetcher_shared_memory_win.cc', |
- 'browser/device_sensors/device_inertial_sensor_service.cc', |
- 'browser/device_sensors/device_inertial_sensor_service.h', |
- 'browser/device_sensors/device_light_message_filter.cc', |
- 'browser/device_sensors/device_light_message_filter.h', |
- 'browser/device_sensors/device_motion_message_filter.cc', |
- 'browser/device_sensors/device_motion_message_filter.h', |
- 'browser/device_sensors/device_orientation_message_filter.cc', |
- 'browser/device_sensors/device_orientation_message_filter.h', |
- 'browser/device_sensors/inertial_sensor_consts.h', |
- 'browser/device_sensors/sensor_manager_android.cc', |
- 'browser/device_sensors/sensor_manager_android.h', |
- 'browser/device_sensors/sensor_manager_chromeos.cc', |
- 'browser/device_sensors/sensor_manager_chromeos.h', |
'browser/devtools/browser_devtools_agent_host.cc', |
'browser/devtools/browser_devtools_agent_host.h', |
'browser/devtools/devtools_agent_host_impl.cc', |
@@ -1832,9 +1811,6 @@ |
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
'../third_party/isimpledom/isimpledom.gyp:isimpledom', |
], |
- 'sources/': [ |
- ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], |
- ], |
'defines': [ |
# This prevents the inclusion of atlhost.h which paired |
# with the windows 8 sdk it does the wrong thing. |
@@ -1915,7 +1891,6 @@ |
], |
}, |
'sources/': [ |
- ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'], |
['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], |
['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], |
['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'], |
@@ -1934,15 +1909,11 @@ |
] |
}], |
['OS=="mac"', { |
- 'sources/': [ |
- ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], |
- ], |
'sources!': [ |
'browser/geolocation/empty_wifi_data_provider.cc', |
], |
'dependencies': [ |
'../third_party/mozilla/mozilla.gyp:mozilla', |
- '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor', |
'../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_widget_mac', |
], |
'link_settings': { |
@@ -1958,7 +1929,6 @@ |
'../chromeos/chromeos.gyp:power_manager_proto', |
], |
'sources!': [ |
- 'browser/device_sensors/data_fetcher_shared_memory_default.cc', |
'browser/geolocation/wifi_data_provider_linux.cc', |
'browser/power_save_blocker_ozone.cc', |
'browser/power_save_blocker_x11.cc', |