Commit 4aad6e77 authored by mikhail.pozdnyakov's avatar mikhail.pozdnyakov Committed by Commit bot

[sensors] Drop DEVICE_SENSOR_EXPORT macro

It is not needed as 'generic_sensor' is build as a source set and it causes linker warnings on windows component build.

BUG=640769

Review-Url: https://codereview.chromium.org/2277353002
Cr-Commit-Position: refs/heads/master@{#414714}
parent f3215625
...@@ -12,15 +12,12 @@ source_set("generic_sensor") { ...@@ -12,15 +12,12 @@ source_set("generic_sensor") {
"platform_sensor_provider_base.cc", "platform_sensor_provider_base.cc",
"platform_sensor_provider_base.h", "platform_sensor_provider_base.h",
"platform_sensor_provider_default.cc", "platform_sensor_provider_default.cc",
"sensor_export.h",
"sensor_impl.cc", "sensor_impl.cc",
"sensor_impl.h", "sensor_impl.h",
"sensor_provider_impl.cc", "sensor_provider_impl.cc",
"sensor_provider_impl.h", "sensor_provider_impl.h",
] ]
defines = [ "DEVICE_GENERIC_SENSOR_IMPLEMENTATION" ]
deps = [ deps = [
"//base", "//base",
"//device/generic_sensor/public/interfaces", "//device/generic_sensor/public/interfaces",
......
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ #define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_
#include "base/logging.h" #include "base/logging.h"
#include "device/generic_sensor/sensor_export.h"
namespace device { namespace device {
class DEVICE_SENSOR_EXPORT PlatformSensorConfiguration { class PlatformSensorConfiguration {
public: public:
PlatformSensorConfiguration(); PlatformSensorConfiguration();
explicit PlatformSensorConfiguration(double frequency); explicit PlatformSensorConfiguration(double frequency);
......
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
mojom = "//device/generic_sensor/public/interfaces/sensor.mojom" mojom = "//device/generic_sensor/public/interfaces/sensor.mojom"
public_headers = [ public_headers = [ "//device/generic_sensor/platform_sensor_configuration.h" ]
"//device/generic_sensor/platform_sensor_configuration.h",
"//device/generic_sensor/sensor_export.h",
]
traits_headers = traits_headers =
[ "//device/generic_sensor/public/interfaces/sensor_struct_traits.h" ] [ "//device/generic_sensor/public/interfaces/sensor_struct_traits.h" ]
sources = [ sources = [
......
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef DEVICE_GENERIC_SENSOR_SENSOR_EXPORT_H_
#define DEVICE_GENERIC_SENSOR_SENSOR_EXPORT_H_
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION)
#define DEVICE_SENSOR_EXPORT __declspec(dllexport)
#else
#define DEVICE_SENSOR_EXPORT __declspec(dllimport)
#endif // defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION)
#define DEVICE_SENSOR_EXPORT __attribute__((visibility("default")))
#else
#define DEVICE_SENSOR_EXPORT
#endif
#endif
#else // defined(COMPONENT_BUILD)
#define DEVICE_SENSOR_EXPORT
#endif
#endif // DEVICE_GENERIC_SENSOR_SENSOR_EXPORT_H_
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "base/macros.h" #include "base/macros.h"
#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" #include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h"
#include "device/generic_sensor/sensor_export.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/strong_binding.h"
namespace device { namespace device {
...@@ -19,8 +18,7 @@ class PlatformSensorProvider; ...@@ -19,8 +18,7 @@ class PlatformSensorProvider;
// of PlatformSensor which are used by SensorImpl. // of PlatformSensor which are used by SensorImpl.
class SensorProviderImpl final : public mojom::SensorProvider { class SensorProviderImpl final : public mojom::SensorProvider {
public: public:
DEVICE_SENSOR_EXPORT static void Create( static void Create(mojo::InterfaceRequest<mojom::SensorProvider> request);
mojo::InterfaceRequest<mojom::SensorProvider> request);
~SensorProviderImpl() override; ~SensorProviderImpl() override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment