[NaCl SDK] Remove old/unused gyp defines

- use_nacl_clang is now the default and has no meaning.
- ninja is the default generator for gyp_chromeium and
  gyp_nacl.
- support for nacl_allow_thin_archives was reverted from NaCl
- Made GypNinjaBuild_Pnacl and GypNinjaBuild_PPAPI
  consistent.

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

Review URL: https://codereview.chromium.org/1684883002

Cr-Commit-Position: refs/heads/master@{#374694}

native_client_sdk/src/build_tools/build_artifacts.py

@@ -200,8 +200,7 @@ def NinjaBuild(targets, out_dir):
 
 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
   gyp_env = dict(os.environ)
-  gyp_env['GYP_GENERATORS'] = 'ninja'
-  gyp_defines = ['nacl_allow_thin_archives=0']
+  gyp_defines = []
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
   if arch:
@@ -210,8 +209,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
       gyp_env['GYP_CROSSCOMPILE'] = '1'
       if options.no_arm_trusted:
         gyp_defines.append('disable_cross_trusted=1')
-  if PLATFORM == 'mac':
-    gyp_defines.append('clang=1')
 
   gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
   generator_flags = ['-G', 'output_dir=%s' % out_dir]

native_client_sdk/src/build_tools/build_sdk.py

@@ -459,7 +459,7 @@ def GypNinjaBuild_PPAPI(arch, rel_out_dir):
   GypNinjaBuild(arch, gyp_py, gyp_file, 'ppapi_lib', out_dir)
 
 
-def GypNinjaBuild_Pnacl(rel_out_dir, target_arch):
+def GypNinjaBuild_Pnacl(arch, rel_out_dir):
   # TODO(binji): This will build the pnacl_irt_shim twice; once as part of the
   # Chromium build, and once here. When we move more of the SDK build process
   # to gyp, we can remove this.
@@ -468,14 +468,12 @@ def GypNinjaBuild_Pnacl(rel_out_dir, target_arch):
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
                           'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
-  targets = ['aot']
-  GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir)
+  GypNinjaBuild(arch, gyp_py, gyp_file, 'aot', out_dir)
 
 
 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
   gyp_env = dict(os.environ)
-  gyp_env['GYP_GENERATORS'] = 'ninja'
-  gyp_defines = ['nacl_allow_thin_archives=0', 'use_nacl_clang=1']
+  gyp_defines = []
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
 
@@ -535,7 +533,7 @@ def BuildStepBuildToolchains(pepperdir, toolchains, build, clean):
       for arch in ('ia32', 'arm'):
         # Fill in the latest native pnacl shim library from the chrome build.
         build_dir = GYPBUILD_DIR + '-pnacl-' + arch
-        GypNinjaBuild_Pnacl(build_dir, arch)
+        GypNinjaBuild_Pnacl(arch, build_dir)
 
   GypNinjaInstall(pepperdir, toolchains)
 

native_client_sdk/src/build_tools/tests/build_artifacts_test.py

@@ -106,7 +106,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
     self.options_mock = patch('build_artifacts.options').start()
     self.options_mock.mac_sdk = False
     self.options_mock.no_arm_trusted = False
-    self.gyp_defines_base = ['nacl_allow_thin_archives=0']
+    self.gyp_defines_base = []
 
   def testSimple(self):
     build_artifacts.GypNinjaBuild(
@@ -115,8 +115,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja',
-                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
+             env={'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
@@ -128,7 +127,6 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
-                 'GYP_GENERATORS': 'ninja',
                  'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                          ['target_arch=x64']),
              }),
@@ -142,8 +140,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja',
-                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
+             env={'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target1', 'target2'],
              cwd='src_dir')
     ])
@@ -158,9 +155,8 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
-                                       ['mac_sdk=10.6', 'clang=1']),
+                                       ['mac_sdk=10.6']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
@@ -175,7 +171,6 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              cwd='src_dir',
              env={
                'GYP_CROSSCOMPILE': '1',
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                        ['target_arch=arm']),
              }),
@@ -193,7 +188,6 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              cwd='src_dir',
              env={
                'GYP_CROSSCOMPILE': '1',
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                        ['target_arch=arm',
                                         'disable_cross_trusted=1']),