diff options
author | thakis <thakis@chromium.org> | 2015-07-07 07:50:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-07 14:51:23 +0000 |
commit | 128c8573daa2a188b05db7121382d44dc73540e0 (patch) | |
tree | 9b339712c004dced6ef631605d60f80af7305b3d /mojo/test | |
parent | 9c300066cbb580179a97f9eec0f8f57bcbea993f (diff) | |
download | chromium_src-128c8573daa2a188b05db7121382d44dc73540e0.zip chromium_src-128c8573daa2a188b05db7121382d44dc73540e0.tar.gz chromium_src-128c8573daa2a188b05db7121382d44dc73540e0.tar.bz2 |
Revert of Update mojo sdk to rev a05bfef8096006056b2fff78092faf14d1319782 (patchset #1 id:1 of https://codereview.chromium.org/1216023006/)
Reason for revert:
This caused
../../third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc(133,1)
: error: 'selectany' can only be applied to data items with external linkage
MOJO_STATIC_CONST_MEMBER_DEFINITION
^
../../third_party/mojo/src\mojo/public/cpp/system/macros.h(65,56) : note:
expanded from macro 'MOJO_STATIC_CONST_MEMBER_DEFINITION'
#define MOJO_STATIC_CONST_MEMBER_DEFINITION __declspec(selectany)
^
on the clang/win bots. This is caused by
https://github.com/domokit/mojo/commit/6fb90aaf1c21dfefc526a0e589d54cb59511322d
which uses MOJO_STATIC_CONST_MEMBER_DEFINITION in an unnamed namespace,
and declspec(selectany) doesn't have any effect on internal symbols. Since it requires
a deps change to fix, reverting this roll for now. It should be easy to fix and reroll.
Original issue's description:
> Update mojo sdk to rev a05bfef8096006056b2fff78092faf14d1319782
>
> BUG=None
> TBR=jam@chromium.org
>
> Committed: https://crrev.com/8de6daffb831795171ab2c9d4220d5bf63574833
> Cr-Commit-Position: refs/heads/master@{#337551}
TBR=jam@chromium.org,rockot@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/1219933003
Cr-Commit-Position: refs/heads/master@{#337601}
Diffstat (limited to 'mojo/test')
-rw-r--r-- | mojo/test/BUILD.gn | 15 | ||||
-rw-r--r-- | mojo/test/test_utils.h | 21 | ||||
-rw-r--r-- | mojo/test/test_utils_posix.cc | 21 | ||||
-rw-r--r-- | mojo/test/test_utils_win.cc | 22 |
4 files changed, 0 insertions, 79 deletions
diff --git a/mojo/test/BUILD.gn b/mojo/test/BUILD.gn deleted file mode 100644 index 05f54a4..0000000 --- a/mojo/test/BUILD.gn +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2015 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. - -source_set("test_support") { - sources = [ - "test_utils.h", - "test_utils_posix.cc", - "test_utils_win.cc", - ] - - public_deps = [ - "//base", - ] -} diff --git a/mojo/test/test_utils.h b/mojo/test/test_utils.h deleted file mode 100644 index ffb4c28..0000000 --- a/mojo/test/test_utils.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2015 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_TEST_TEST_UTILS_H_ -#define MOJO_TEST_TEST_UTILS_H_ - -#include <string> - -#include "base/files/file_path.h" - -namespace mojo { -namespace test { - -// Returns the path to the mojom js bindings file. -base::FilePath GetFilePathForJSResource(const std::string& path); - -} // namespace test -} // namespace mojo - -#endif // MOJO_TEST_TEST_UTILS_H_ diff --git a/mojo/test/test_utils_posix.cc b/mojo/test/test_utils_posix.cc deleted file mode 100644 index 5ac356f..0000000 --- a/mojo/test/test_utils_posix.cc +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2015 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/test/test_utils.h" - -#include "base/base_paths.h" -#include "base/path_service.h" - -namespace mojo { -namespace test { - -base::FilePath GetFilePathForJSResource(const std::string& path) { - std::string binding_path = "gen/" + path + ".js"; - base::FilePath exe_dir; - PathService::Get(base::DIR_EXE, &exe_dir); - return exe_dir.AppendASCII(binding_path); -} - -} // namespace test -} // namespace mojo diff --git a/mojo/test/test_utils_win.cc b/mojo/test/test_utils_win.cc deleted file mode 100644 index e022c9a..0000000 --- a/mojo/test/test_utils_win.cc +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2015 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/test/test_utils.h" - -#include "base/base_paths.h" -#include "base/path_service.h" -#include "base/strings/string_util.h" -namespace mojo { -namespace test { - -base::FilePath GetFilePathForJSResource(const std::string& path) { - std::string binding_path = "gen/" + path + ".js"; - base::ReplaceChars(binding_path, "//", "\\", &binding_path); - base::FilePath exe_dir; - PathService::Get(base::DIR_EXE, &exe_dir); - return exe_dir.AppendASCII(binding_path); -} - -} // namespace test -} // namespace mojo |