Revert 242405 "Skip downloading of nacl toolchain for android. "

trunk/src/build/download_nacl_toolchains.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.
 
 """Shim to run nacl toolchain download script only if there is a nacl dir."""
 
 import os
 import sys
 
 
 def Main(args):
   # Exit early if disable_nacl=1.
   if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
-    print 'NACL is disabled. Skipping NativeClient toolchain download.'
     return 0
   script_dir = os.path.dirname(os.path.abspath(__file__))
   src_dir = os.path.dirname(script_dir)
   nacl_dir = os.path.join(src_dir, 'native_client')
   nacl_build_dir = os.path.join(nacl_dir, 'build')
   download_script = os.path.join(nacl_build_dir, 'download_toolchains.py')
   if not os.path.exists(download_script):
     print "Can't find '%s'" % download_script
     print 'Presumably you are intentionally building without NativeClient.'
     print 'Skipping NativeClient toolchain download.'
@@ skipping 29 matching lines @@
   # a chrome location to avoid branching NaCl if just a toolchain needs
   # to be bumped.
   args.append(os.path.join(nacl_dir, 'TOOL_REVISIONS'))
 
   download_toolchains.main(args)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))