diff options
Diffstat (limited to 'mojo/public')
25 files changed, 45 insertions, 42 deletions
diff --git a/mojo/public/bindings/lib/DEPS b/mojo/public/bindings/lib/DEPS index 7f810b1..0a519d5 100644 --- a/mojo/public/bindings/lib/DEPS +++ b/mojo/public/bindings/lib/DEPS @@ -1,5 +1,6 @@ include_rules = [ - "-mojo" - "+mojo/public/environment" - "+mojo/public/system" + "-mojo", + "+mojo/public/bindings", + "+mojo/public/cpp/environment", + "+mojo/public/cpp/system", ] diff --git a/mojo/public/bindings/lib/buffer.cc b/mojo/public/bindings/lib/buffer.cc index c77ec80..8b29169 100644 --- a/mojo/public/bindings/lib/buffer.cc +++ b/mojo/public/bindings/lib/buffer.cc @@ -6,8 +6,8 @@ #include <assert.h> +#include "mojo/public/cpp/environment/buffer_tls.h" #include "mojo/public/cpp/system/macros.h" -#include "mojo/public/environment/buffer_tls.h" namespace mojo { diff --git a/mojo/public/bindings/lib/connector.h b/mojo/public/bindings/lib/connector.h index 253a5dd..eeb0f53 100644 --- a/mojo/public/bindings/lib/connector.h +++ b/mojo/public/bindings/lib/connector.h @@ -7,8 +7,8 @@ #include "mojo/public/bindings/lib/message_queue.h" #include "mojo/public/bindings/message.h" +#include "mojo/public/cpp/environment/default_async_waiter.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/environment/default_async_waiter.h" namespace mojo { class ErrorHandler; diff --git a/mojo/public/bindings/tests/array_unittest.cc b/mojo/public/bindings/tests/array_unittest.cc index 2df6ed7..bce99d9 100644 --- a/mojo/public/bindings/tests/array_unittest.cc +++ b/mojo/public/bindings/tests/array_unittest.cc @@ -6,7 +6,7 @@ #include "mojo/public/bindings/array.h" #include "mojo/public/bindings/lib/fixed_buffer.h" #include "mojo/public/bindings/lib/scratch_buffer.h" -#include "mojo/public/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/buffer_unittest.cc b/mojo/public/bindings/tests/buffer_unittest.cc index d2ff91e..c8d2f21 100644 --- a/mojo/public/bindings/tests/buffer_unittest.cc +++ b/mojo/public/bindings/tests/buffer_unittest.cc @@ -8,7 +8,7 @@ #include "mojo/public/bindings/lib/bindings_serialization.h" #include "mojo/public/bindings/lib/fixed_buffer.h" #include "mojo/public/bindings/lib/scratch_buffer.h" -#include "mojo/public/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/connector_unittest.cc b/mojo/public/bindings/tests/connector_unittest.cc index 30c7aa4..94eb951 100644 --- a/mojo/public/bindings/tests/connector_unittest.cc +++ b/mojo/public/bindings/tests/connector_unittest.cc @@ -8,9 +8,9 @@ #include "mojo/public/bindings/lib/connector.h" #include "mojo/public/bindings/lib/message_builder.h" #include "mojo/public/bindings/lib/message_queue.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/handle_passing_unittest.cc b/mojo/public/bindings/tests/handle_passing_unittest.cc index dfac4cf..5467996 100644 --- a/mojo/public/bindings/tests/handle_passing_unittest.cc +++ b/mojo/public/bindings/tests/handle_passing_unittest.cc @@ -5,8 +5,8 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/bindings/tests/sample_factory.mojom.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/environment.h" #include "mojo/public/tests/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/mojo/public/bindings/tests/remote_ptr_unittest.cc b/mojo/public/bindings/tests/remote_ptr_unittest.cc index 880e957..1f786a0 100644 --- a/mojo/public/bindings/tests/remote_ptr_unittest.cc +++ b/mojo/public/bindings/tests/remote_ptr_unittest.cc @@ -6,8 +6,8 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/bindings/tests/math_calculator.mojom.h" #include "mojo/public/bindings/tests/sample_service.mojom.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/request_response_unittest.cc b/mojo/public/bindings/tests/request_response_unittest.cc index 3455cc5..f7d2346 100644 --- a/mojo/public/bindings/tests/request_response_unittest.cc +++ b/mojo/public/bindings/tests/request_response_unittest.cc @@ -6,8 +6,8 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/bindings/tests/sample_import.mojom.h" #include "mojo/public/bindings/tests/sample_interfaces.mojom.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/environment.h" #include "mojo/public/tests/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/mojo/public/bindings/tests/router_unittest.cc b/mojo/public/bindings/tests/router_unittest.cc index 3e04a30..b86ede6 100644 --- a/mojo/public/bindings/tests/router_unittest.cc +++ b/mojo/public/bindings/tests/router_unittest.cc @@ -8,9 +8,9 @@ #include "mojo/public/bindings/lib/message_builder.h" #include "mojo/public/bindings/lib/message_queue.h" #include "mojo/public/bindings/lib/router.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/sample_service_unittest.cc b/mojo/public/bindings/tests/sample_service_unittest.cc index c568bb4..72400fd 100644 --- a/mojo/public/bindings/tests/sample_service_unittest.cc +++ b/mojo/public/bindings/tests/sample_service_unittest.cc @@ -8,7 +8,7 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/tests/sample_service.mojom.h" -#include "mojo/public/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/bindings/tests/type_conversion_unittest.cc b/mojo/public/bindings/tests/type_conversion_unittest.cc index 81202e0..950199c 100644 --- a/mojo/public/bindings/tests/type_conversion_unittest.cc +++ b/mojo/public/bindings/tests/type_conversion_unittest.cc @@ -4,7 +4,7 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/tests/test_structs.mojom.h" -#include "mojo/public/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/public/environment/buffer_tls.h b/mojo/public/cpp/environment/buffer_tls.h index 60929e9..42cf826 100644 --- a/mojo/public/environment/buffer_tls.h +++ b/mojo/public/cpp/environment/buffer_tls.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_ -#define MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_ namespace mojo { class Buffer; @@ -17,4 +17,4 @@ Buffer* SetCurrentBuffer(Buffer* buffer); } // namespace internal } // namespace mojo -#endif // MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_ diff --git a/mojo/public/environment/default_async_waiter.h b/mojo/public/cpp/environment/default_async_waiter.h index d1cf779..d7f48bf 100644 --- a/mojo/public/environment/default_async_waiter.h +++ b/mojo/public/cpp/environment/default_async_waiter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ -#define MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ #include "mojo/public/c/system/async_waiter.h" @@ -14,4 +14,4 @@ MojoAsyncWaiter* GetDefaultAsyncWaiter(); } // namespace mojo -#endif // MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_ diff --git a/mojo/public/environment/environment.h b/mojo/public/cpp/environment/environment.h index aa6fb51..f75e2f7 100644 --- a/mojo/public/environment/environment.h +++ b/mojo/public/cpp/environment/environment.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_ -#define MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ #include "mojo/public/cpp/system/macros.h" @@ -21,4 +21,4 @@ class Environment { } // namespace mojo -#endif // MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ diff --git a/mojo/public/cpp/environment/lib/DEPS b/mojo/public/cpp/environment/lib/DEPS new file mode 100644 index 0000000..1889e1f --- /dev/null +++ b/mojo/public/cpp/environment/lib/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+mojo/public/cpp/environment", + "+mojo/public/cpp/utility", +] diff --git a/mojo/public/environment/lib/buffer_tls.cc b/mojo/public/cpp/environment/lib/buffer_tls.cc index fc31f0f..d54faba 100644 --- a/mojo/public/environment/lib/buffer_tls.cc +++ b/mojo/public/cpp/environment/lib/buffer_tls.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/environment/buffer_tls.h" +#include "mojo/public/cpp/environment/buffer_tls.h" #include <assert.h> +#include "mojo/public/cpp/environment/lib/buffer_tls_setup.h" #include "mojo/public/cpp/utility/lib/thread_local.h" -#include "mojo/public/environment/lib/buffer_tls_setup.h" namespace mojo { namespace internal { diff --git a/mojo/public/environment/lib/buffer_tls_setup.h b/mojo/public/cpp/environment/lib/buffer_tls_setup.h index 8f5daa1..f0ca0b1 100644 --- a/mojo/public/environment/lib/buffer_tls_setup.h +++ b/mojo/public/cpp/environment/lib/buffer_tls_setup.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ -#define MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ namespace mojo { namespace internal { @@ -14,4 +14,4 @@ void TearDownCurrentBuffer(); } // namespace internal } // namespace mojo -#endif // MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_ diff --git a/mojo/public/environment/lib/default_async_waiter.cc b/mojo/public/cpp/environment/lib/default_async_waiter.cc index b6c337c..73e41de 100644 --- a/mojo/public/environment/lib/default_async_waiter.cc +++ b/mojo/public/cpp/environment/lib/default_async_waiter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/environment/default_async_waiter.h" +#include "mojo/public/cpp/environment/default_async_waiter.h" #include <assert.h> diff --git a/mojo/public/environment/lib/environment.cc b/mojo/public/cpp/environment/lib/environment.cc index 71f024f..b3148af 100644 --- a/mojo/public/environment/lib/environment.cc +++ b/mojo/public/cpp/environment/lib/environment.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/lib/buffer_tls_setup.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/lib/buffer_tls_setup.h" namespace mojo { diff --git a/mojo/public/cpp/environment/tests/DEPS b/mojo/public/cpp/environment/tests/DEPS new file mode 100644 index 0000000..9266146 --- /dev/null +++ b/mojo/public/cpp/environment/tests/DEPS @@ -0,0 +1,6 @@ +include_rules = [ + "+testing", + "+mojo/public/cpp/utility", + # TODO(vtl): Temporary until these are moved to mojo/public/cpp: + "+mojo/public/tests", +] diff --git a/mojo/public/environment/tests/async_waiter_unittest.cc b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc index 6d5d27d..444fdef 100644 --- a/mojo/public/environment/tests/async_waiter_unittest.cc +++ b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc @@ -4,11 +4,11 @@ #include <string> +#include "mojo/public/cpp/environment/default_async_waiter.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/environment/default_async_waiter.h" -#include "mojo/public/environment/environment.h" #include "mojo/public/tests/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/mojo/public/environment/DEPS b/mojo/public/environment/DEPS deleted file mode 100644 index 7758789..0000000 --- a/mojo/public/environment/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "-mojo/public" - "+mojo/public/system" -] diff --git a/mojo/public/environment/lib/DEPS b/mojo/public/environment/lib/DEPS deleted file mode 100644 index 6dd1241..0000000 --- a/mojo/public/environment/lib/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "+mojo/public/environment" - "+mojo/public/cpp/utility" -] diff --git a/mojo/public/gles2/gles2_cpp.h b/mojo/public/gles2/gles2_cpp.h index 6750910..7f23835 100644 --- a/mojo/public/gles2/gles2_cpp.h +++ b/mojo/public/gles2/gles2_cpp.h @@ -5,7 +5,7 @@ #ifndef MOJO_PUBLIC_GLES2_GLES2_CPP_H_ #define MOJO_PUBLIC_GLES2_GLES2_CPP_H_ -#include "mojo/public/environment/default_async_waiter.h" +#include "mojo/public/cpp/environment/default_async_waiter.h" #include "mojo/public/gles2/gles2.h" namespace mojo { |