Updates to Android.mk generation.

gyp/common.gypi

 # Copyright 2011 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # This file is automatically included by gyp_skia when building any target.
 
 {
   'includes': [
     'common_variables.gypi',
@@ skipping 70 matching lines @@
           ],
         },
       }],
       [ 'skia_win_debuggers_path and skia_os == "win"',
         {
           'defines': [
             'SK_USE_CDB',
           ],
         },
       ],
-      [ 'skia_android_framework==0', {
+      [ 'skia_android_framework', {
+        'defines!': [
+          'SK_SCALAR_TO_FLOAT_EXCLUDED',
+        ],
+      }, {
         # These defines are not used for skia_android_framework, where we build
         # one makefile and allow someone to add SK_DEBUG etc for their own
         # debugging purposes.
         'configurations': {
           'Debug': {
             'defines': [
               'SK_DEBUG',
               'SK_DEVELOPER=1',
             ],
           },
           'Release': {
             'defines': [
               'SK_RELEASE',
             ],
           },
           'Release_Developer': {
             'inherit_from': ['Release'],
             'defines': [
               'SK_DEVELOPER=1',
             ],
           },
         },
       }],
     ],
   }, # end 'target_defaults'
 }