Updates to Android.mk generation.

gyp/common.gypi

Index: gyp/common.gypi
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 2a5bbd493e216bdd6009e8c58857076c3265a8d7..fe268c47a9c4e2f1cc5382a503440d3e19dc29a7 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -88,7 +88,11 @@
           ],
         },
       ],
-      [ 'skia_android_framework==0', {
+      [ 'skia_android_framework', {
+        'defines!': [
+          'SK_SCALAR_TO_FLOAT_EXCLUDED',

[djsollen, 2014/03/26 20:17:03]

why do we need to call this out here?  Won't we need this for now if the WebView
wanted to use the system copy of Skia?

[scroggo, 2014/03/27 19:33:00]

Removed.

[scroggo, 2014/03/28 17:39:28]

It turns out we *do* need this here*. All the negatives are confusing, but
here's how it works:

If you define this flag, SkFloatToScalar is not defined.

Android still uses SkFloatToScalar:
https://cs.corp.google.com/#search/&q=skfloattoscalar&sq=package:android

Here I'm changing it so we do *not* define this flag, meaning that
SkFloatToScalar *is* defined.

Defining SkFloatToScalar will not interfere with building WebView.

*Until we stop calling SkFloatToScalar in frameworks/base.

+        ],
+      }, {
         # 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.