diff options
author | jamesr <jamesr@chromium.org> | 2014-10-22 17:52:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 00:53:09 +0000 |
commit | 0d571a86ede798451f8579737cefe04f231d7aa1 (patch) | |
tree | 46d9f407ef3e32c758c890214cdb5a431ea78500 /mojo | |
parent | 77d1e3890147ab453d580623c9bbae511957e34d (diff) | |
download | chromium_src-0d571a86ede798451f8579737cefe04f231d7aa1.zip chromium_src-0d571a86ede798451f8579737cefe04f231d7aa1.tar.gz chromium_src-0d571a86ede798451f8579737cefe04f231d7aa1.tar.bz2 |
Remove mojo/go - this is being developed in the mojo repo
R=tburkard@chromium.org
Review URL: https://codereview.chromium.org/675573002
Cr-Commit-Position: refs/heads/master@{#300813}
Diffstat (limited to 'mojo')
-rw-r--r-- | mojo/BUILD.gn | 11 | ||||
-rw-r--r-- | mojo/go/BUILD.gn | 24 | ||||
-rw-r--r-- | mojo/go/c_embedder/c_embedder.cc | 22 | ||||
-rw-r--r-- | mojo/go/c_embedder/c_embedder.h | 18 | ||||
-rw-r--r-- | mojo/go/system/embedder/embedder.go | 14 | ||||
-rw-r--r-- | mojo/go/system/impl/core_impl.go | 27 | ||||
-rw-r--r-- | mojo/go/tests/system_test.go | 23 |
7 files changed, 0 insertions, 139 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 4c5a0e6..02f8157 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -7,9 +7,6 @@ import("//build/config/ui.gni") group("mojo") { # Meta-target, don't link into production code. testonly = true - declare_args() { - mojo_use_go = false - } deps = [ ":tests", "//mojo/apps/js:mojo_js_content_handler", @@ -27,14 +24,6 @@ group("mojo") { "//mojo/android", ] } - - if (is_linux) { - if (mojo_use_go) { - deps += [ - "//mojo/go", - ] - } - } } group("tests") { diff --git a/mojo/go/BUILD.gn b/mojo/go/BUILD.gn deleted file mode 100644 index e190379..0000000 --- a/mojo/go/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 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. - -import("//build/go/rules.gni") - -group("go") { - deps = [ - ":system_test", - ] -} - -go_test_binary("system_test") { - sources = [ - "tests/system_test.go", - ] - static_library_sources = [ - "c_embedder/c_embedder.cc", - "c_embedder/c_embedder.h", - ] - deps = [ - "//mojo/edk/system", - ] -} diff --git a/mojo/go/c_embedder/c_embedder.cc b/mojo/go/c_embedder/c_embedder.cc deleted file mode 100644 index 7d6a2e0..0000000 --- a/mojo/go/c_embedder/c_embedder.cc +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2014 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. - -#include "mojo/go/c_embedder/c_embedder.h" - -#include "base/memory/scoped_ptr.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/simple_platform_support.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void InitializeMojoEmbedder() { - mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>( - new mojo::embedder::SimplePlatformSupport())); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/mojo/go/c_embedder/c_embedder.h b/mojo/go/c_embedder/c_embedder.h deleted file mode 100644 index f2961d6..0000000 --- a/mojo/go/c_embedder/c_embedder.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2014 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 MOJO_GO_C_EMBEDDER_C_EMBEDDER_H_ -#define MOJO_GO_C_EMBEDDER_C_EMBEDDER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -__attribute__((visibility("default"))) void InitializeMojoEmbedder(); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // MOJO_GO_C_EMBEDDER_C_EMBEDDER_H__ diff --git a/mojo/go/system/embedder/embedder.go b/mojo/go/system/embedder/embedder.go deleted file mode 100644 index 6f605df..0000000 --- a/mojo/go/system/embedder/embedder.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2014 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. - -package embedder; - -/* -#include "mojo/go/c_embedder/c_embedder.h" -*/ -import "C" - -func InitializeMojoEmbedder() { - C.InitializeMojoEmbedder(); -} diff --git a/mojo/go/system/impl/core_impl.go b/mojo/go/system/impl/core_impl.go deleted file mode 100644 index 9341a06e..0000000 --- a/mojo/go/system/impl/core_impl.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2014 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. - -package impl - -/* -#include "mojo/public/platform/native/system_thunks.h" -*/ -import "C" -import "mojo/public/go/mojo/edk/system" - -type CoreImpl struct { -} - -func (c CoreImpl) GetTimeTicksNow() int64 { - return (int64)(C.MojoGetTimeTicksNow()) -} - -var lazyInstance *CoreImpl = nil - -func GetCore() system.Core { - if lazyInstance == nil { - lazyInstance = new(CoreImpl) - } - return lazyInstance -} diff --git a/mojo/go/tests/system_test.go b/mojo/go/tests/system_test.go deleted file mode 100644 index 549d01d..0000000 --- a/mojo/go/tests/system_test.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2014 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. - -package tests - -import "mojo/go/system/embedder" -import "mojo/go/system/impl" -import "mojo/public/go/mojo/edk/system" -import "testing" - -func Init() { - embedder.InitializeMojoEmbedder() -} - -func TestGetTimeTicksNow(t *testing.T) { - Init() - var c system.Core = impl.GetCore() - x := c.GetTimeTicksNow() - if x < 10 { - t.Error("Invalid GetTimeTicksNow return value") - } -} |