GN: Build NaCl tests for x64 too on x86 Windows

build/config/nacl/rules.gni

 # Copyright 2015 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 
 # Generate a nmf file
 #
 # Native Client Manifest (nmf) is a JSON file that tells the browser where to
@@ skipping 53 matching lines @@
                       rebase_path(stage_dependencies, root_build_dir) ]
         lib_path = stage_dependencies
       } else {
         lib_path = root_build_dir
       }
       if (defined(lib_prefix)) {
         nmfflags += [ "--lib-prefix=" + lib_prefix ]
         lib_path += "/${lib_prefix}"
       }
 
-      # NOTE: There is no explicit dependency for the lib32
-      # and lib64 directories created in the product directory.
+      # Starts empty so the code below can use += everywhere.
+      data = []
+
+      nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
+
+      # NOTE: There is no explicit dependency for the lib directory
+      # (lib32 and lib64 for x86/x64) created in the product directory.
       # They are created as a side-effect of nmf creation.
-      nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
-      if (current_cpu == "x86") {
-        nmfflags += [ "--library-path=" +
-                      rebase_path("${nacl_toolchain_tooldir}/lib32") ]
-        data = [
-          "${lib_path}/lib32/",
-        ]
-      } else if (current_cpu == "x64") {
+      if (current_cpu != "x86" && current_cpu != "x64") {
         nmfflags +=
             [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
-        data = [
-          "${lib_path}/lib64/",
-        ]
+        data += [ "${lib_path}/lib/" ]
       } else {
-        nmfflags +=
-            [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
-        data = [
-          "${lib_path}/lib/",
-        ]
+        # For x86-32, the lib/ directory is called lib32/ instead.
+        if (current_cpu == "x86") {
+          nmfflags += [ "--library-path=" +
+                        rebase_path("${nacl_toolchain_tooldir}/lib32") ]
+          data += [ "${lib_path}/lib32/" ]
+        }
+
+        # x86-32 Windows needs to build both x86-32 and x86-64 NaCl
+        # binaries into the same nmf covering both architectures.  That
+        # gets handled at a higher level (see the nacl_test_data template),
+        # so a single generate_nmf invocation gets both x86-32 and x86-64
+        # nexes listed in executables.
+        if (current_cpu == "x64" || target_os == "win") {
+          # For x86-64, the lib/ directory is called lib64/ instead
+          # when copied by create_nmf.py.
+          glibc_tc = "//build/toolchain/nacl:glibc"
+          assert(current_toolchain == "${glibc_tc}_${current_cpu}")
+          if (current_cpu == "x64") {
+            x64_out_dir = root_out_dir
+          } else {
+            x64_out_dir = get_label_info(":${target_name}(${glibc_tc}_x64)",
+                                         "root_out_dir")
+          }
+          nmfflags += [
+            "--library-path=" + rebase_path(x64_out_dir),
+            "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib"),
+          ]
+          data += [ "${lib_path}/lib64/" ]
+        }
       }
     }
     args = [
              "--no-default-libpath",
              "--objdump=" + objdump,
              "--output=" + rebase_path(nmf, root_build_dir),
            ] + nmfflags + rebase_path(sources, root_build_dir)
     if (is_nacl_glibc && current_cpu == "arm") {
       deps += [ "//native_client/src/untrusted/elf_loader:elf_loader" ]
     }
@@ skipping 46 matching lines @@
     args = [
       "--program=" + rebase_path(executable, root_build_dir),
       "--arch=${arch}",
       "--output=" + rebase_path(nmf, root_build_dir),
     ]
     if (defined(invoker.nmfflags)) {
       args += invoker.nmfflags
     }
   }
 }