[NaCl SDK] Re-enable 32-bit sel_ldr build for mac

The lack of sel_ldr_x86_32 is causing the webports
tree to be red for all mac builders.  Re-enabling
seems more trivial and updating expectations in
webports.

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_nacl_sdk;master.tryserver.chromium.mac:mac_nacl_sdk;master.tryserver.chromium.win:win_nacl_sdk

Review-Url: https://codereview.chromium.org/2353683003
Cr-Commit-Position: refs/heads/master@{#419619}

chrome/BUILD.gn

@@ -811,7 +811,11 @@ if (is_win) {
       public_deps = []
 
       if (enable_nacl) {
-        sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
+        if (current_cpu == "x86") {
+          sources += [ "$root_out_dir/nacl_irt_x86_32.nexe" ]
+        } else if (current_cpu == "x64") {
+          sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
+        }
         public_deps += [ "//ppapi/native_client:irt" ]
       }
     }

native_client_sdk/src/build_tools/build_sdk.py

@@ -370,8 +370,7 @@ def GnNinjaInstall(pepperdir, toolchains):
       pair[1] += '.exe'
 
   InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_x64)
-  if platform != 'mac':
-    InstallFiles(GetNinjaOutDir('x86'), tools_dir, tools_files_x86)
+  InstallFiles(GetNinjaOutDir('x86'), tools_dir, tools_files_x86)
   if platform == 'linux':
     InstallFiles(GetNinjaOutDir('arm'), tools_dir, tools_files_arm)
 
@@ -403,14 +402,10 @@ def GnNinjaBuildAll(rel_out_dir):
   def MakeNinjaRelPath(suffix):
     return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), rel_out_dir + suffix)
 
-  platform = getos.GetPlatform()
-
-  GnNinjaBuild('x64', MakeNinjaRelPath('-x64'),
-      ['nacl_sdk_untrusted=true'])
-  if platform != 'mac':
-    GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
+  GnNinjaBuild('x64', MakeNinjaRelPath('-x64'), ['nacl_sdk_untrusted=true'])
+  GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
 
-  if platform == 'linux':
+  if getos.GetPlatform() == 'linux':
     GnNinjaBuild('arm', MakeNinjaRelPath('-arm'))
 
 
@@ -435,9 +430,10 @@ def GnNinjaBuild(arch, out_dir, extra_gn_args=None):
   if platform == 'mac':
     if options.mac_sdk:
       gn_args.append('mac_sdk_min="%s"' % options.mac_sdk)
-    # Without this the target_cpu='arm' build complains about missing code
-    # signing identity
-    gn_args.append('use_ios_simulator=true')
+    if arch == 'arm':
+      # Without this the target_cpu='arm' build complains about missing code
+      # signing identity
+      gn_args.append('use_ios_simulator=true')
 
   gn_exe = GetGNExecutable(platform)
 

native_client_sdk/src/build_tools/sdk_files.list

@@ -490,6 +490,5 @@ tools/oshelpers.py
 tools/run.py
 tools/sel_ldr.py
 [linux]tools/sel_ldr_arm
-[linux]tools/sel_ldr_x86_32${EXE_EXT}
-[win]tools/sel_ldr_x86_32${EXE_EXT}
+tools/sel_ldr_x86_32${EXE_EXT}
 tools/sel_ldr_x86_64${EXE_EXT}

native_client_sdk/src/build_tools/test_sdk.py

@@ -101,12 +101,11 @@ def RunTest(test, toolchain, config, arch=None):
                                        args=args + ['run'])
 
   if getos.GetPlatform() == 'win':
-    # On win32 we only support running on the system
-    # arch
+    # On win32 we only support running on the system arch
     archs = (getos.GetSystemArch('win'),)
   elif getos.GetPlatform() == 'mac':
-    # We only ship 64-bit version of sel_ldr on mac.
-    archs = ('x86_64',)
+    # On mac we can run both 32 and 64-bit
+    archs = ('x86_64', 'x86_32')
   else:
     # On linux we can run both 32 and 64-bit, and arm (via qemu)
     archs = ('x86_64', 'x86_32', 'arm')