diff options
author | Hidehiko Abe <hidehiko@google.com> | 2018-04-24 02:15:00 +0900 |
---|---|---|
committer | Hidehiko Abe <hidehiko@google.com> | 2018-04-24 10:13:47 +0900 |
commit | 920588a1acdc4721abb713d8162010e4b85ae53e (patch) | |
tree | 5d0b02a305d2ce5e91eb915695a338dabff2ed6b /ipc/ipc_channel_handle.h | |
parent | ca6c42abc66e142da1036f0061976d671862c457 (diff) | |
download | libmojo-920588a1acdc4721abb713d8162010e4b85ae53e.tar.gz |
Migrate libmojo repository into libchrome, part 2.HEADandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releasemastermain
This CL moves following files.
- .gitignore
- Android.bp is merged into libchrome's Android.bp.
- base/android/*
- build/* except build_config.h which is exactly same with libchrome's.
- ipc/*
- mojo/*
- soong/* into libchrome_tools/
- third_party/{catapult,jinja2,markupsafe,ply}/*
- ui/gfx/{geometry,range}/mojo/*
Then removed following files:
- Android.bp
- CleanSpec.mk
- build/build_config.h
And added README.md to notify the migration.
Bug: 73606903
Test: Built locally. Ran on DUT.
Change-Id: I94aa1b43ff0854f48f30fdf03025bd1c8a346038
Diffstat (limited to 'ipc/ipc_channel_handle.h')
-rw-r--r-- | ipc/ipc_channel_handle.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/ipc/ipc_channel_handle.h b/ipc/ipc_channel_handle.h deleted file mode 100644 index ef31b84..0000000 --- a/ipc/ipc_channel_handle.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2012 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 IPC_IPC_CHANNEL_HANDLE_H_ -#define IPC_IPC_CHANNEL_HANDLE_H_ - -#include <string> - -#include "build/build_config.h" -#include "mojo/public/cpp/system/message_pipe.h" - -#if defined(OS_NACL_SFI) -#include "base/file_descriptor_posix.h" -#endif // defined (OS_NACL_SFI) - -namespace IPC { - -// Note that serialization for this object is defined in the ParamTraits -// template specialization in ipc_message_utils.h. -#if defined(OS_NACL_SFI) -struct ChannelHandle { - ChannelHandle() {} - explicit ChannelHandle(const base::FileDescriptor& s) : socket(s) {} - - base::FileDescriptor socket; -}; -#else -struct ChannelHandle { - ChannelHandle() {} - ChannelHandle(mojo::MessagePipeHandle h) : mojo_handle(h) {} - - bool is_mojo_channel_handle() const { return mojo_handle.is_valid(); } - - mojo::MessagePipeHandle mojo_handle; -}; -#endif // defined(OS_NACL_SFI) - -} // namespace IPC - -#endif // IPC_IPC_CHANNEL_HANDLE_H_ |