diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:25:57 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:25:57 +0000 |
| commit | 3b6e6832197c9b46e2f62ff0f0d61ffb05c17ff4 (patch) | |
| tree | 2a74f887120574e3841d445e8090180e1a9d0dd6 /device | |
| parent | 228b7d93eb3804edce4ddaa44f7839b7226c8739 (diff) | |
| download | chromium_src-3b6e6832197c9b46e2f62ff0f0d61ffb05c17ff4.zip chromium_src-3b6e6832197c9b46e2f62ff0f0d61ffb05c17ff4.tar.gz chromium_src-3b6e6832197c9b46e2f62ff0f0d61ffb05c17ff4.tar.bz2 | |
Pull buildtools to get GN r282653
This uses the proto file directory for the generated files rather than the directory of the BUILD file. This makes it more natural when you have a BUILD file in a different directory than the proto files.
Fixes a search-and-replace error that accidentally changed the fallback source_prereqs code to use "inputs".
Fix ozone build.
BUG=
R=ajwong@chromium.org
Review URL: https://codereview.chromium.org/386943006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/media_transfer_protocol/BUILD.gn | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/device/media_transfer_protocol/BUILD.gn b/device/media_transfer_protocol/BUILD.gn index 0e2ff84..aea3c6b 100644 --- a/device/media_transfer_protocol/BUILD.gn +++ b/device/media_transfer_protocol/BUILD.gn @@ -7,14 +7,12 @@ import("//third_party/protobuf/proto_library.gni") # GYP version: device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto proto_library("mtp_file_entry_proto") { sources = [ "//third_party/cros_system_api/dbus/mtp_file_entry.proto" ] - proto_in_dir = "//third_party/cros_system_api/dbus" proto_out_dir = "device/media_transfer_protocol" } # GYP version: device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto proto_library("mtp_storage_info_proto") { sources = [ "//third_party/cros_system_api/dbus/mtp_storage_info.proto" ] - proto_in_dir = "//third_party/cros_system_api/dbus" proto_out_dir = "device/media_transfer_protocol" } |