diff options
| author | rockot <rockot@chromium.org> | 2015-08-22 18:42:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-23 01:42:53 +0000 |
| commit | bd9bf5a43f904f59ebac4f0982a3e3ddddf61e4b (patch) | |
| tree | 3c161b06e3a5e95ad142a7f4ea28b0816ba0fb9e /device | |
| parent | 59c45a7ebc21338ca0bf3b5e10b815a18e9ac7b9 (diff) | |
| download | chromium_src-bd9bf5a43f904f59ebac4f0982a3e3ddddf61e4b.zip chromium_src-bd9bf5a43f904f59ebac4f0982a3e3ddddf61e4b.tar.gz chromium_src-bd9bf5a43f904f59ebac4f0982a3e3ddddf61e4b.tar.bz2 | |
Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (patchset #1 id:1 of https://codereview.chromium.org/1310103002/ )
Reason for revert:
Looks like this breaks mojo_system_unittests on Android...
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=29595
Original issue's description:
> Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598
>
> Re-land. Previously conflicted with another CL that landed
> just before the roll.
>
> BUG=None
> TBR=jam@chromium.org,ben@chromium.org
> TBR=mfoltz@chromium.org
> TBR=mek@chromium.org
> TBR=xhwang@chromium.org
> TBR=shess@chromium.org
>
> Committed: https://crrev.com/0bfe154baad9ddfb1f0c6ecc7cace36e8f430e75
> Cr-Commit-Position: refs/heads/master@{#344994}
TBR=ben@chromium.org,jam@chromium.org,mek@chromium.org,mfoltz@chromium.org,shess@chromium.org,xhwang@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/1309103002
Cr-Commit-Position: refs/heads/master@{#344996}
Diffstat (limited to 'device')
| -rw-r--r-- | device/serial/data_receiver.h | 1 | ||||
| -rw-r--r-- | device/serial/data_sink_receiver.h | 1 | ||||
| -rw-r--r-- | device/serial/data_source_sender.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h index 0eba0a2..774d395 100644 --- a/device/serial/data_receiver.h +++ b/device/serial/data_receiver.h @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace device { diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h index 733b0a1..8bb306e 100644 --- a/device/serial/data_sink_receiver.h +++ b/device/serial/data_sink_receiver.h @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace device { diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h index 160dec9..2de7ce6 100644 --- a/device/serial/data_source_sender.h +++ b/device/serial/data_source_sender.h @@ -12,7 +12,6 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace device { |