[NaCl SDK] Update the make_pnacl_component script to GN

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 831 matching lines @@
   # Ship with libraries prebuilt, so run that first.
   BuildStepBuildLibraries(pepperdir)
   GenerateNotice(pepperdir)
 
   # Verify the SDK contains what we expect.
   BuildStepVerifyFilelist(pepperdir)
 
   if options.tar:
     BuildStepTarBundle(pepper_ver, tarfile)
 
-  # TODO(sbc): Re-enable this once we switch the pnacl component build
-  # from gyp to gn:
-  # https://bugs.chromium.org/p/chromium/issues/detail?id=646241
-  #if platform == 'linux':
-    #BuildStepBuildPNaClComponent(pepper_ver, chrome_revision)
+  if platform == 'linux':
+    BuildStepBuildPNaClComponent(pepper_ver, chrome_revision)
 
   if options.build_app_engine and platform == 'linux':
     BuildStepBuildAppEngine(pepperdir, chrome_revision)
 
   if options.qemu:
     qemudir = os.path.join(NACL_DIR, 'toolchain', 'linux_arm-trusted')
     oshelpers.Copy(['-r', qemudir, pepperdir])
 
   # Archive the results on Google Cloud Storage.
   if options.archive:
     BuildStepArchiveBundle('build', pepper_ver, chrome_revision, nacl_revision,
                            tarfile)
     # Only archive sdk_tools/naclport/pnacl_component on linux.
     if platform == 'linux':
       BuildStepArchiveSDKTools()
       #BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')