Skip to content

GitLab

T
tangled
Commit 2f969bff authored by Bill Orr's avatar Bill Orr Committed by Commit Bot
Browse files
Options

Remove duplicate jsoncpp from OpenVR 

OpenVR by default includes its own jsoncpp.  However, we have one
in third_party already, so we don't need OpenVR's copy.

BUG=780987,790814,896087

Change-Id: Iac57998856ac72b36b6b731b3860ca67ae7c3f45
Reviewed-on: https://chromium-review.googlesource.com/c/1294669Reviewed-by: default avatarKlaus Weidner <klausw@chromium.org>
Commit-Queue: Bill Orr <billorr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602033}
parent af38308b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 16204 deletions
device/vr/BUILD.gn
View file @ 2f969bff
......@@ -213,6 +213,7 @@ if (enable_openvr) {
deps = [
"//base",
"//device/vr/public/mojom:test_mojom",
"//third_party/openvr:openvr_headers",
]
}
}
......
third_party/openvr/BUILD.gn
View file @ 2f969bff
......@@ -2,6 +2,22 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
source_set("openvr_headers") {
sources = [
"src/headers/openvr.h",
"src/headers/openvr_capi.h",
"src/headers/openvr_driver.h",
"src/src/ivrclientcore.h",
"src/src/vrcommon/dirtools_public.h",
"src/src/vrcommon/envvartools_public.h",
"src/src/vrcommon/hmderrors_public.h",
"src/src/vrcommon/pathtools_public.h",
"src/src/vrcommon/sharedlibtools_public.h",
"src/src/vrcommon/strtools_public.h",
"src/src/vrcommon/vrpathregistry_public.h",
]
}
component("openvr") {
output_name = "openvr_api"
......@@ -20,15 +36,29 @@ component("openvr") {
]
sources = [
"src/src/jsoncpp.cpp",
"src/headers/openvr.h",
"src/headers/openvr_capi.h",
"src/headers/openvr_driver.h",
"src/src/ivrclientcore.h",
"src/src/openvr_api_public.cpp",
"src/src/vrcommon/dirtools_public.cpp",
"src/src/vrcommon/dirtools_public.h",
"src/src/vrcommon/envvartools_public.cpp",
"src/src/vrcommon/envvartools_public.h",
"src/src/vrcommon/hmderrors_public.cpp",
"src/src/vrcommon/hmderrors_public.h",
"src/src/vrcommon/pathtools_public.cpp",
"src/src/vrcommon/pathtools_public.h",
"src/src/vrcommon/sharedlibtools_public.cpp",
"src/src/vrcommon/sharedlibtools_public.h",
"src/src/vrcommon/strtools_public.cpp",
"src/src/vrcommon/strtools_public.h",
"src/src/vrcommon/vrpathregistry_public.cpp",
"src/src/vrcommon/vrpathregistry_public.h",
]
public_deps = [
"//third_party/jsoncpp",
]
if (target_cpu == "x64" && is_win) {
......@@ -38,7 +68,7 @@ component("openvr") {
include_dirs = [
"src/headers",
"src/src",
"src/src/json",
"src/src/vrcommon",
"//third_party/jsoncpp/source/include",
]
}
third_party/openvr/README.chromium
View file @ 2f969bff
......@@ -13,13 +13,10 @@ The OpenVR API supports HTC Vive and other headsets for VR.
Local Modifications:
Only contains a subset of the git repo necessary to build Chromium.
jsoncpp.cpp has been modified to replace two "throw" statements with invocations
of JSON_FAIL_MESSAGE because "cannot use 'throw' with exceptions disabled".
openvr.h has been modified to remove dllimport/dllexport when building a
non-component build so this can be built as a static library.
Redefined VRLog to avoid logspam on startup.
json.h has been modified to convert a std::swap overload to Json::swap, so that
we can avoid -Wmicrosoft-exception-spec warning.
We use jsoncpp from \\third_party.
Copy the correct files with these commands:
copy %openvrsdk%\README.md %chromium%\src\third_party\openvr\src
......
third_party/openvr/src/headers/openvr_api.cs deleted 100644 → 0
View file @ af38308b
This source diff could not be displayed because it is too large. You can view the blob instead.
third_party/openvr/src/headers/openvr_api.json deleted 100644 → 0
View file @ af38308b
This source diff could not be displayed because it is too large. You can view the blob instead.
third_party/openvr/src/src/json/json-forwards.h deleted 100644 → 0
View file @ af38308b
/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).
/// It is intended to be used with #include "json/json-forwards.h"
/// This header provides forward declaration for all JsonCpp types.
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: LICENSE
// //////////////////////////////////////////////////////////////////////
/*
The JsonCpp library's source code, including accompanying documentation,
tests and demonstration applications, are licensed under the following
conditions...
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
jurisdictions which recognize such a disclaimer. In such jurisdictions,
this software is released into the Public Domain.
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
released under the terms of the MIT License (see below).
In jurisdictions which recognize Public Domain property, the user of this
software may choose to accept it either as 1) Public Domain, 2) under the
conditions of the MIT License (see below), or 3) under the terms of dual
Public Domain/MIT License conditions described here, as they choose.
The MIT License is about as close to Public Domain as a license can get, and is
described in clear, concise terms at:
http://en.wikipedia.org/wiki/MIT_License
The full text of the MIT License follows:
========================================================================
Copyright (c) 2007-2010 Baptiste Lepilleur
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
========================================================================
(END LICENSE TEXT)
The MIT license is compatible with both the GPL and commercial
software, affording one all of the rights of Public Domain with the
minor nuisance of being required to keep the above copyright notice
and license text in the source code. Note also that by accepting the
Public Domain "license" you can re-license your copy using whatever
license you like.
*/
// //////////////////////////////////////////////////////////////////////
// End of content of file: LICENSE
// //////////////////////////////////////////////////////////////////////
#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED
# define JSON_FORWARD_AMALGATED_H_INCLUDED
/// If defined, indicates that the source file is amalgated
/// to prevent private header inclusion.
#define JSON_IS_AMALGAMATION
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: include/json/config.h
// //////////////////////////////////////////////////////////////////////
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_CONFIG_H_INCLUDED
#define JSON_CONFIG_H_INCLUDED
/// If defined, indicates that json library is embedded in CppTL library.
//# define JSON_IN_CPPTL 1
/// If defined, indicates that json may leverage CppTL library
//# define JSON_USE_CPPTL 1
/// If defined, indicates that cpptl vector based map should be used instead of
/// std::map
/// as Value container.
//# define JSON_USE_CPPTL_SMALLMAP 1
// If non-zero, the library uses exceptions to report bad input instead of C
// assertion macros. The default is to use exceptions.
#ifndef JSON_USE_EXCEPTION
#define JSON_USE_EXCEPTION 1
#endif
/// If defined, indicates that the source file is amalgated
/// to prevent private header inclusion.
/// Remarks: it is automatically defined in the generated amalgated header.
// #define JSON_IS_AMALGAMATION
#ifdef JSON_IN_CPPTL
#include <cpptl/config.h>
#ifndef JSON_USE_CPPTL
#define JSON_USE_CPPTL 1
#endif
#endif
#ifdef JSON_IN_CPPTL
#define JSON_API CPPTL_API
#elif defined(JSON_DLL_BUILD)
#if defined(_MSC_VER)
#define JSON_API __declspec(dllexport)
#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
#endif // if defined(_MSC_VER)
#elif defined(JSON_DLL)
#if defined(_MSC_VER)
#define JSON_API __declspec(dllimport)
#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
#endif // if defined(_MSC_VER)
#endif // ifdef JSON_IN_CPPTL
#if !defined(JSON_API)
#define JSON_API
#endif
// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
// integer
// Storages, and 64 bits integer support is disabled.
// #define JSON_NO_INT64 1
#if defined(_MSC_VER) // MSVC
# if _MSC_VER <= 1200 // MSVC 6
// Microsoft Visual Studio 6 only support conversion from __int64 to double
// (no conversion from unsigned __int64).
# define JSON_USE_INT64_DOUBLE_CONVERSION 1
// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
// characters in the debug information)
// All projects I've ever seen with VS6 were using this globally (not bothering
// with pragma push/pop).
# pragma warning(disable : 4786)
# endif // MSVC 6
# if _MSC_VER >= 1500 // MSVC 2008
/// Indicates that the following function is deprecated.
# define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
# endif
#endif // defined(_MSC_VER)
#ifndef JSON_HAS_RVALUE_REFERENCES
#if defined(_MSC_VER) && _MSC_VER >= 1600 // MSVC >= 2010
#define JSON_HAS_RVALUE_REFERENCES 1
#endif // MSVC >= 2010
#ifdef __clang__
#if __has_feature(cxx_rvalue_references)
#define JSON_HAS_RVALUE_REFERENCES 1
#endif // has_feature
#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103L)
#define JSON_HAS_RVALUE_REFERENCES 1
#endif // GXX_EXPERIMENTAL
#endif // __clang__ || __GNUC__
#endif // not defined JSON_HAS_RVALUE_REFERENCES
#ifndef JSON_HAS_RVALUE_REFERENCES
#define JSON_HAS_RVALUE_REFERENCES 0
#endif
#ifdef __clang__
#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
# define JSONCPP_DEPRECATED(message) __attribute__ ((deprecated(message)))
# elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
# define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
# endif // GNUC version
#endif // __clang__ || __GNUC__
#if !defined(JSONCPP_DEPRECATED)
#define JSONCPP_DEPRECATED(message)
#endif // if !defined(JSONCPP_DEPRECATED)
namespace Json {
typedef int Int;
typedef unsigned int UInt;
#if defined(JSON_NO_INT64)
typedef int LargestInt;
typedef unsigned int LargestUInt;
#undef JSON_HAS_INT64
#else // if defined(JSON_NO_INT64)
// For Microsoft Visual use specific types as long long is not supported
#if defined(_MSC_VER) // Microsoft Visual Studio
typedef __int64 Int64;
typedef unsigned __int64 UInt64;
#else // if defined(_MSC_VER) // Other platforms, use long long
typedef long long int Int64;
typedef unsigned long long int UInt64;
#endif // if defined(_MSC_VER)
typedef Int64 LargestInt;
typedef UInt64 LargestUInt;
#define JSON_HAS_INT64
#endif // if defined(JSON_NO_INT64)
} // end namespace Json
#endif // JSON_CONFIG_H_INCLUDED
// //////////////////////////////////////////////////////////////////////
// End of content of file: include/json/config.h
// //////////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: include/json/forwards.h
// //////////////////////////////////////////////////////////////////////
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_FORWARDS_H_INCLUDED
#define JSON_FORWARDS_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
#include "config.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
namespace Json {
// writer.h
class FastWriter;
class StyledWriter;
// reader.h
class Reader;
// features.h
class Features;
// value.h
typedef unsigned int ArrayIndex;
class StaticString;
class Path;
class PathArgument;
class Value;
class ValueIteratorBase;
class ValueIterator;
class ValueConstIterator;
} // namespace Json
#endif // JSON_FORWARDS_H_INCLUDED
// //////////////////////////////////////////////////////////////////////
// End of content of file: include/json/forwards.h
// //////////////////////////////////////////////////////////////////////
#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED
third_party/openvr/src/src/json/json.h deleted 100644 → 0
View file @ af38308b
This diff is collapsed.
third_party/openvr/src/src/jsoncpp.cpp deleted 100644 → 0
View file @ af38308b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment