Fix Android framework build

platform_tools/android/gyp_gen/android_framework_gyp.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Modified version of gyp_skia, used by gyp_to_android.py to generate Android.mk
 """
@@ skipping 41 matching lines @@
     print 'gyp_source_dir is "%s"' % gyp_source_dir
     if not os.path.exists(gyp_source_dir):
       print 'and it does not exist!'
 
   assert os.path.exists(gyp_source_dir)
 
   sys.path.insert(0, os.path.join(gyp_source_dir, 'pylib'))
 
   import gyp
 
+  # Determine the host that we are building from
+  host_os = os.uname()[0].lower()

[msarett, 2015/07/22 14:27:41]

Maybe it doesn't need to be this complicated and host_os will always be linux?

+
   # Set GYP_DEFINES for building for the android framework.
-  gyp_defines = ('skia_android_framework=1 OS=android skia_arch_type=%s '
-                 % skia_arch_type)
+  gyp_defines = ('skia_android_framework=1 OS=android host_os=%s '
+                 'skia_arch_type=%s ' % (host_os, skia_arch_type))
   if skia_arch_type == 'arm':
     # Always version 7 (which implies thumb) for arm
     gyp_defines += 'arm_version=7 '
     if have_neon:
       gyp_defines += 'arm_neon=1 '
     else:
       gyp_defines += 'arm_neon=0 '
 
   os.environ['GYP_DEFINES'] = gyp_defines
 
@@ skipping 25 matching lines @@
   """Remove the gypd files generated by main().
 
   Args:
     folder: Folder in which to delete all files ending with 'gypd'.
   """
   assert os.path.isdir(folder)
   files = os.listdir(folder)
   for f in files:
     if f.endswith('gypd'):
       os.remove(os.path.join(folder, f))