| Index: ppapi/native_client/src/trusted/plugin/plugin.cc
|
| diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
|
| index 47a31f36b6e195351c5f409ea8ccbe25805139b4..529a963df07d4e966b0bf4431ce3b4d4c9b7c266 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/plugin.cc
|
| +++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
|
| @@ -42,7 +42,6 @@
|
| #include "ppapi/native_client/src/trusted/plugin/json_manifest.h"
|
| #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
|
| #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
|
| -#include "ppapi/native_client/src/trusted/plugin/nexe_arch.h"
|
| #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
|
| #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
|
| #include "ppapi/native_client/src/trusted/plugin/utility.h"
|
| @@ -530,7 +529,7 @@ Plugin* Plugin::New(PP_Instance pp_instance) {
|
| // failure. Note that module loading functions will log their own errors.
|
| bool Plugin::Init(uint32_t argc, const char* argn[], const char* argv[]) {
|
| PLUGIN_PRINTF(("Plugin::Init (argc=%" NACL_PRIu32 ")\n", argc));
|
| - HistogramEnumerateOsArch(GetSandboxISA());
|
| + HistogramEnumerateOsArch(nacl_interface_->GetSandboxISA());
|
| init_time_ = NaClGetTimeOfDayMicroseconds();
|
| url_util_ = pp::URLUtil_Dev::Get();
|
| if (url_util_ == NULL)
|
| @@ -1154,10 +1153,11 @@ bool Plugin::SetManifestObject(const nacl::string& manifest_json,
|
| bool nonsfi_mode_enabled =
|
| PP_ToBool(nacl_interface_->IsNonSFIModeEnabled());
|
| bool pnacl_debug = GetNaClInterface()->NaClDebugStubEnabled();
|
| + const char* sandbox_isa = nacl_interface_->GetSandboxISA();
|
| nacl::scoped_ptr<JsonManifest> json_manifest(
|
| new JsonManifest(url_util_,
|
| manifest_base_url(),
|
| - (is_pnacl ? kPortableISA : GetSandboxISA()),
|
| + (is_pnacl ? kPortableISA : sandbox_isa),
|
| nonsfi_mode_enabled,
|
| pnacl_debug));
|
| if (!json_manifest->Init(manifest_json, error_info)) {
|
|
|