Allow to have different files for different ISAs in NaCl manifest.

ppapi/native_client/src/trusted/plugin/json_manifest.cc

 /*
  * Copyright (c) 2012 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 <algorithm>
 
 #include "native_client/src/trusted/plugin/json_manifest.h"
 
@@ skipping 229 matching lines @@
     // Could be "arch/portable" : URLSpec, or
     // it could be "arch/portable" : { "pnacl-translate": URLSpec }
     // for executables that need to be translated.
     Json::Value property_value = dictionary[property_name];
     nacl::string error_string;
     if (!IsValidUrlSpec(property_value, property_name, parent_key,
                         &error_string) &&
         !IsValidPnaclTranslateSpec(property_value, property_name,
                                    parent_key, &error_string)) {
       error_info->SetReport(ERROR_MANIFEST_SCHEMA_VALIDATE,
-                            nacl::string("manifiest: ") + error_string);
+                            nacl::string("manifest: ") + error_string);
       return false;
     }
   }
 
-  // TODO(elijahtaylor) add ISA resolver here if we expand ISAs to include
-  // micro-architectures that can resolve to multiple valid sandboxes.
-  bool has_isa = dictionary.isMember(sandbox_isa);
-  bool has_portable = dictionary.isMember(kPortableKey);
+  if (!sandbox_isa.empty()) {
+    // TODO(elijahtaylor) add ISA resolver here if we expand ISAs to include
+    // micro-architectures that can resolve to multiple valid sandboxes.
+    bool has_isa = dictionary.isMember(sandbox_isa);
+    bool has_portable = dictionary.isMember(kPortableKey);
 
-  if (!has_isa && !has_portable) {
-    error_info->SetReport(
-        ERROR_MANIFEST_PROGRAM_MISSING_ARCH,
-        nacl::string("manifest: no version of ") + parent_key +
-        " given for current arch and no portable version found.");
-    return false;
+    if (!has_isa && !has_portable) {
+      error_info->SetReport(
+          ERROR_MANIFEST_PROGRAM_MISSING_ARCH,
+          nacl::string("manifest: no version of ") + parent_key +
+          " given for current arch and no portable version found.");
+      return false;
+    }
   }
 
   return true;
 }
 
 void GrabUrlAndPnaclOptions(const Json::Value& url_spec,
                             nacl::string* url,
                             PnaclOptions* pnacl_options) {
   *url = url_spec[kUrlKey].asString();
   if (url_spec.isMember(kCacheIdentityKey)) {
@@ skipping 15 matching lines @@
 bool GetURLFromISADictionary(const Json::Value& dictionary,
                              const nacl::string& parent_key,
                              const nacl::string& sandbox_isa,
                              bool prefer_portable,
                              nacl::string* url,
                              PnaclOptions* pnacl_options,
                              ErrorInfo* error_info) {
   if (url == NULL || pnacl_options == NULL || error_info == NULL)
     return false;
 
-  if (!IsValidISADictionary(dictionary, parent_key, sandbox_isa, error_info))
+  if (!IsValidISADictionary(dictionary, parent_key, sandbox_isa, error_info)) {
+    error_info->SetReport(ERROR_MANIFEST_RESOLVE_URL,
+                          "architecture " + sandbox_isa +
+                          " is not found for file " + parent_key);
     return false;
+  }
 
   *url = "";
 
   // The call to IsValidISADictionary() above guarantees that either
   // sandbox_isa or kPortableKey is present in the dictionary.
   bool has_portable = dictionary.isMember(kPortableKey);
   bool has_isa = dictionary.isMember(sandbox_isa);
   nacl::string chosen_isa;
   if ((has_portable && prefer_portable) || !has_isa) {
     chosen_isa = kPortableKey;
@@ skipping 114 matching lines @@
     if (!files.isObject()) {
       error_info->SetReport(
           ERROR_MANIFEST_SCHEMA_VALIDATE,
           nacl::string("manifest: '") + kFilesKey + "' is not a dictionary.");
     }
     Json::Value::Members members = files.getMemberNames();
     for (size_t i = 0; i < members.size(); ++i) {
       nacl::string file_name = members[i];
       if (!IsValidISADictionary(files[file_name],
                                 file_name,
-                                sandbox_isa_,
+                                nacl::string(),
                                 error_info)) {
         return false;
       }
     }
   }
 
   return true;
 }
 
 bool JsonManifest::ResolveURL(const nacl::string& relative_url,
@@ skipping 98 matching lines @@
     error_info->SetReport(
         ERROR_MANIFEST_RESOLVE_URL,
         nacl::string("ResolveKey: no such \"files\" entry: ") + key);
     return false;
   }
   return GetKeyUrl(files, rest, sandbox_isa_, this, prefer_portable_,
                    full_url, pnacl_options, error_info);
 }
 
 }  // namespace plugin