diff options
| author | Ben Smith <binji@chromium.org> | 2015-04-01 16:45:32 -0700 |
|---|---|---|
| committer | Ben Smith <binji@chromium.org> | 2015-04-01 23:48:02 +0000 |
| commit | b1d1c57d3c3f68cae1ac1b2f83e5e65ba4222558 (patch) | |
| tree | da438a40b41e46ccfaf319c17696251c45fb45b6 /native_client_sdk | |
| parent | 441ece58d63d2bf6e1f82e4055c71ef2f2ef63f4 (diff) | |
| download | chromium_src-b1d1c57d3c3f68cae1ac1b2f83e5e65ba4222558.zip chromium_src-b1d1c57d3c3f68cae1ac1b2f83e5e65ba4222558.tar.gz chromium_src-b1d1c57d3c3f68cae1ac1b2f83e5e65ba4222558.tar.bz2 | |
[NaCl SDK] Hack workaround for jsoncpp breakage.
A recent change to the third_party/jsoncpp headers breaks Native Client because
it assumes the directories are all relative to Chrome root.
This change stops using the Chrome overrides and provides its own which fixes a
different issue when linking w/ PNaCl.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/1056663004
Cr-Commit-Position: refs/heads/master@{#323372}
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/libraries/jsoncpp/json_reader_fix.cpp | 10 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/jsoncpp/library.dsc | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/native_client_sdk/src/libraries/jsoncpp/json_reader_fix.cpp b/native_client_sdk/src/libraries/jsoncpp/json_reader_fix.cpp new file mode 100644 index 0000000..59dc7b7 --- /dev/null +++ b/native_client_sdk/src/libraries/jsoncpp/json_reader_fix.cpp @@ -0,0 +1,10 @@ +// 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. + +// NOTE(binji): These headers are needed for the link to succeed on PNaCl when +// using libc++. +#include <string> +#include <istream> + +#include "json_reader.cpp" diff --git a/native_client_sdk/src/libraries/jsoncpp/library.dsc b/native_client_sdk/src/libraries/jsoncpp/library.dsc index 6029ce2..22551ff 100644 --- a/native_client_sdk/src/libraries/jsoncpp/library.dsc +++ b/native_client_sdk/src/libraries/jsoncpp/library.dsc @@ -1,8 +1,7 @@ { 'TOOLS': ['bionic', 'newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'], 'SEARCH': [ - '../../../../third_party/jsoncpp/overrides/include/json', - '../../../../third_party/jsoncpp/overrides/src/lib_json', + '.', '../../../../third_party/jsoncpp/source/include/json', '../../../../third_party/jsoncpp/source/src/lib_json', '../../../../third_party/jsoncpp', @@ -13,7 +12,7 @@ 'TYPE' : 'lib', 'DEFINES': ['JSON_USE_EXCEPTION=0'], 'SOURCES' : [ - 'json_reader.cpp', + 'json_reader_fix.cpp', 'json_value.cpp', 'json_writer.cpp', ], @@ -44,6 +43,7 @@ 'json_internalmap.inl', 'json_tool.h', 'json_valueiterator.inl', + 'json_reader.cpp', ], 'DEST': 'src', 'NAME': 'jsoncpp', |