OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "native_client/src/trusted/plugin/manifest.h" | 9 #include "native_client/src/trusted/plugin/manifest.h" |
10 | 10 |
11 #include <stdlib.h> | 11 #include <stdlib.h> |
12 | 12 |
13 #include "native_client/src/include/nacl_base.h" | 13 #include "native_client/src/include/nacl_base.h" |
14 #include "native_client/src/include/nacl_macros.h" | 14 #include "native_client/src/include/nacl_macros.h" |
15 #include "native_client/src/include/nacl_string.h" | 15 #include "native_client/src/include/nacl_string.h" |
16 #include "native_client/src/include/portability.h" | 16 #include "native_client/src/include/portability.h" |
17 #include "native_client/src/shared/platform/nacl_check.h" | 17 #include "native_client/src/shared/platform/nacl_check.h" |
18 #include "native_client/src/trusted/plugin/plugin_error.h" | 18 #include "native_client/src/trusted/plugin/plugin_error.h" |
19 #include "native_client/src/trusted/plugin/utility.h" | 19 #include "native_client/src/trusted/plugin/utility.h" |
20 #include "native_client/src/third_party_mod/jsoncpp/include/json/reader.h" | |
21 #include "ppapi/cpp/dev/url_util_dev.h" | 20 #include "ppapi/cpp/dev/url_util_dev.h" |
22 #include "ppapi/cpp/var.h" | 21 #include "ppapi/cpp/var.h" |
| 22 #include "third_party/jsoncpp/source/include/json/reader.h" |
23 | 23 |
24 namespace plugin { | 24 namespace plugin { |
25 | 25 |
26 namespace { | 26 namespace { |
27 // Top-level section name keys | 27 // Top-level section name keys |
28 const char* const kProgramKey = "program"; | 28 const char* const kProgramKey = "program"; |
29 const char* const kInterpreterKey = "interpreter"; | 29 const char* const kInterpreterKey = "interpreter"; |
30 const char* const kFilesKey = "files"; | 30 const char* const kFilesKey = "files"; |
31 | 31 |
32 // ISA Dictionary keys | 32 // ISA Dictionary keys |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL, | 491 error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL, |
492 nacl::string(kPnaclLdKey) + | 492 nacl::string(kPnaclLdKey) + |
493 " must be pre-translated for " + sandbox_isa_ + "!"); | 493 " must be pre-translated for " + sandbox_isa_ + "!"); |
494 return false; | 494 return false; |
495 } | 495 } |
496 | 496 |
497 return ResolveURL(nexe_url, full_url, error_info); | 497 return ResolveURL(nexe_url, full_url, error_info); |
498 } | 498 } |
499 | 499 |
500 } // namespace plugin | 500 } // namespace plugin |
OLD | NEW |