diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 20:53:15 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 20:53:15 +0000 |
commit | 28b9ab6d5c5015145056215d7095c6d8d2550acd (patch) | |
tree | aa54d0e9ef6e1a61eabb33fa20182b4e16d86230 /webkit/fileapi | |
parent | 61dad1cf1bdde4d14d6cd8077a0707e64876df0b (diff) | |
download | chromium_src-28b9ab6d5c5015145056215d7095c6d8d2550acd.zip chromium_src-28b9ab6d5c5015145056215d7095c6d8d2550acd.tar.gz chromium_src-28b9ab6d5c5015145056215d7095c6d8d2550acd.tar.bz2 |
Media Galleries: Port the CrOS MTP D-Bus client to Linux.
BUG=151685
Review URL: https://codereview.chromium.org/11028089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
-rw-r--r-- | webkit/fileapi/media/mtp_device_file_system_config.h | 2 | ||||
-rw-r--r-- | webkit/fileapi/webkit_fileapi.gypi | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/fileapi/media/mtp_device_file_system_config.h b/webkit/fileapi/media/mtp_device_file_system_config.h index f951e04..71bc634 100644 --- a/webkit/fileapi/media/mtp_device_file_system_config.h +++ b/webkit/fileapi/media/mtp_device_file_system_config.h @@ -7,7 +7,7 @@ #include "build/build_config.h" -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) // Implies defined(OS_CHROMEOS) #define SUPPORT_MTP_DEVICE_FILESYSTEM #endif diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi index 5a0da3a..0938b12 100644 --- a/webkit/fileapi/webkit_fileapi.gypi +++ b/webkit/fileapi/webkit_fileapi.gypi @@ -129,6 +129,10 @@ '../chromeos/fileapi/remote_file_system_proxy.h', '../chromeos/fileapi/remote_file_stream_writer.cc', '../chromeos/fileapi/remote_file_stream_writer.h', + ], + }], + ['OS=="linux" or chromeos==1', { + 'sources': [ 'media/device_media_file_util.cc', 'media/device_media_file_util.h', 'media/mtp_device_delegate.h', |