Support Mac android cross compile.

pylib/gyp/generator/ninja.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import gyp
 import gyp.common
 import gyp.msvs_emulation
 import gyp.MSVSVersion
 import gyp.system_test
@@ skipping 1124 matching lines @@
 
     return rule_name
 
 
 def CalculateVariables(default_variables, params):
   """Calculate additional variables for use in the build (called by gyp)."""
   global generator_additional_non_configuration_keys
   global generator_additional_path_sections
   cc_target = os.environ.get('CC.target', os.environ.get('CC', 'cc'))
   flavor = gyp.common.GetFlavor(params)
+  default_variables.setdefault('HOST_OS', gyp.common.GetHostOSFlavor())
   if flavor == 'mac':
     default_variables.setdefault('OS', 'mac')
     default_variables.setdefault('SHARED_LIB_SUFFIX', '.dylib')
     default_variables.setdefault('SHARED_LIB_DIR',
                                  generator_default_variables['PRODUCT_DIR'])
     default_variables.setdefault('LIB_DIR',
                                  generator_default_variables['PRODUCT_DIR'])
 
     # Copy additional generator configuration data from Xcode, which is shared
     # by the Mac Ninja generator.
@@ skipping 64 matching lines @@
   out = OpenOutput(os.path.join(toplevel_build, 'set_environment.bat'))
   vsvars_path = gyp.msvs_emulation.GetVsvarsPath(generator_flags)
   out.write('@call "%s"\n' % vsvars_path)
   out.close()
 
 
 def GenerateOutputForConfig(target_list, target_dicts, data, params,
                             config_name):
   options = params['options']
   flavor = gyp.common.GetFlavor(params)
+  host_os = gyp.common.GetHostOSFlavor()
   generator_flags = params.get('generator_flags', {})
 
   # build_dir: relative path from source root to our output files.
   # e.g. "out/Debug"
   build_dir = os.path.join(generator_flags.get('output_dir', 'out'),
                            config_name)
 
   toplevel_build = os.path.join(options.toplevel_dir, build_dir)
 
   master_ninja = ninja_syntax.Writer(
       OpenOutput(os.path.join(toplevel_build, 'build.ninja')),
       width=120)
 
   # Put build-time support tools in out/{config_name}.
   gyp.common.CopyTool(flavor, toplevel_build)
+  if host_os == 'mac' and flavor != 'mac':
+    gyp.common.CopyTool(flavor, toplevel_build)

[Torne, 2012/08/01 11:20:32]

See comment in make.py but also you've copypasted this wrong, it's using flavor
both times.

 
   # Grab make settings for CC/CXX.
   if flavor == 'win':
     cc = cxx = gyp.msvs_emulation.GetCLPath(generator_flags)
     _WriteWinEnvironmentHelper(toplevel_build, generator_flags)
   else:
     cc, cxx = 'gcc', 'g++'
   build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0])
   make_global_settings = data[build_file].get('make_global_settings', [])
   build_to_root = InvertRelativePath(build_dir)
   for key, value in make_global_settings:
     if key == 'CC': cc = os.path.join(build_to_root, value)
     if key == 'CXX': cxx = os.path.join(build_to_root, value)
 
   flock = 'flock'
-  if flavor == 'mac':
+  if host_os == 'mac':
     flock = './gyp-mac-tool flock'
   master_ninja.variable('cc', os.environ.get('CC', cc))
   master_ninja.variable('cxx', os.environ.get('CXX', cxx))
   if flavor == 'win':
     master_ninja.variable('ld', gyp.msvs_emulation.GetLinkPath(generator_flags))
     master_ninja.variable('idl',
         gyp.msvs_emulation.GetMidlPath(generator_flags))
     master_ninja.variable('ar', gyp.msvs_emulation.GetLibPath(generator_flags))
     # TODO(scottmg): Note that rc.exe isn't part of VS, it's part of the
     # Windows SDK. We currently assume it's in the PATH, we may need to figure
     # out a way to locate it explicitly.
     master_ninja.variable('rc', 'rc.exe')
   else:
     master_ninja.variable('ld', flock + ' linker.lock $cxx')
     master_ninja.variable('ar', os.environ.get('AR', 'ar'))
 
   master_ninja.variable('ar_target', os.environ.get('AR_target', '$ar'))
   master_ninja.variable('cc_target', os.environ.get('CC_target', '$cc'))
   master_ninja.variable('cxx_target', os.environ.get('CXX_target', '$cxx'))
   if flavor == 'win':
     master_ninja.variable('ld_target', os.environ.get('LD_target', '$ld'))
   else:
     master_ninja.variable('ld_target', flock + ' linker.lock $cxx_target')
 
-  if flavor == 'mac':
+  if host_os == 'mac':
     master_ninja.variable('mac_tool', os.path.join('.', 'gyp-mac-tool'))
   master_ninja.newline()
 
   if flavor != 'win':
     master_ninja.rule(
       'cc',
       description='CC $out',
       command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_c '
               '$cflags_pch_c -c $in -o $out'),
       depfile='$out.d')
@@ skipping 142 matching lines @@
       'link',
       description='LINK $out, POSTBUILDS',
       command=('$ld $ldflags -o $out '
                '$in $libs$postbuilds'))
     master_ninja.rule(
       'infoplist',
       description='INFOPLIST $out',
       command=('$cc -E -P -Wno-trigraphs -x c $defines $in -o $out && '
                'plutil -convert xml1 $out $out'))
     master_ninja.rule(
-      'mac_tool',
-      description='MACTOOL $mactool_cmd $in',
-      command='$env $mac_tool $mactool_cmd $in $out')
-    master_ninja.rule(
       'package_framework',
       description='PACKAGE FRAMEWORK $out, POSTBUILDS',
       command='$mac_tool package-framework $out $version$postbuilds '
               '&& touch $out')
+
+  if host_os == 'mac':
+    master_ninja.rule(
+      'mac_tool',
+      description='MACTOOL $mactool_cmd $in',
+      command='$env $mac_tool $mactool_cmd $in $out')
+
   if flavor == 'win':
     master_ninja.rule(
       'stamp',
       description='STAMP $out',
       command='python gyp-win-tool stamp $out')
     master_ninja.rule(
       'copy',
       description='COPY $in $out',
       command='python gyp-win-tool recursive-mirror $in $out')
   else:
@@ skipping 77 matching lines @@
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)