Commit 385034b4 authored by dnicoara's avatar dnicoara Committed by Commit bot

Use USE_UDEV instead of OS_LINUX when trying to use Udev functionality

Fixes the Ozone builder where udev isn't available.

BUG=none

Review URL: https://codereview.chromium.org/604143002

Cr-Commit-Position: refs/heads/master@{#296866}
parent 5c2c85e1
......@@ -25,9 +25,9 @@
#include "chromeos/dbus/permission_broker_client.h"
#endif // defined(OS_CHROMEOS)
#if defined(OS_LINUX)
#if defined(USE_UDEV)
#include "device/udev_linux/udev.h"
#endif // defined(OS_LINUX)
#endif // defined(USE_UDEV)
namespace device {
......@@ -130,7 +130,7 @@ UsbDeviceImpl::UsbDeviceImpl(
CHECK(platform_device) << "platform_device cannot be NULL";
libusb_ref_device(platform_device);
#if defined(OS_LINUX)
#if defined(USE_UDEV)
ScopedUdevPtr udev(udev_new());
ScopedUdevEnumeratePtr enumerate(udev_enumerate_new(udev.get()));
......@@ -322,7 +322,7 @@ const UsbConfigDescriptor& UsbDeviceImpl::GetConfiguration() {
bool UsbDeviceImpl::GetManufacturer(base::string16* manufacturer) {
DCHECK(thread_checker_.CalledOnValidThread());
#if defined(OS_LINUX)
#if defined(USE_UDEV)
if (manufacturer_.empty()) {
return false;
}
......@@ -353,7 +353,7 @@ bool UsbDeviceImpl::GetManufacturer(base::string16* manufacturer) {
bool UsbDeviceImpl::GetProduct(base::string16* product) {
DCHECK(thread_checker_.CalledOnValidThread());
#if defined(OS_LINUX)
#if defined(USE_UDEV)
if (product_.empty()) {
return false;
}
......@@ -384,7 +384,7 @@ bool UsbDeviceImpl::GetProduct(base::string16* product) {
bool UsbDeviceImpl::GetSerialNumber(base::string16* serial_number) {
DCHECK(thread_checker_.CalledOnValidThread());
#if defined(OS_LINUX)
#if defined(USE_UDEV)
if (serial_number_.empty()) {
return false;
}
......
......@@ -63,7 +63,7 @@ class UsbDeviceImpl : public UsbDevice {
base::ThreadChecker thread_checker_;
PlatformUsbDevice platform_device_;
#if defined(OS_LINUX)
#if defined(USE_UDEV)
// On Linux these properties are read from sysfs when the device is enumerated
// to avoid hitting the permission broker on Chrome OS for a real string
// descriptor request.
......
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