Small fixes for auto generating Android.mk

gyp/common_variables.gypi

 # Copyright 2012 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.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 39 matching lines @@
       },
 
       # Re-define all variables defined within the level-3 'variables' dict,
       # so that siblings of the level-2 'variables' dict can see them.
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
+          'skia_chrome_utils%': 0,
         }, {
           'skia_os%': '<(skia_os)',
+          'skia_chrome_utils%': 1,
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux", "win"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
@@ skipping 20 matching lines @@
       ],
 
       'skia_sanitizer%': '',
       'skia_scalar%': 'float',
       'skia_mesa%': 0,
       'skia_stroke_path_rendering%': 0,
       'skia_android_path_rendering%': 0,
       'skia_resource_cache_mb_limit%': 0,
       'skia_resource_cache_count_limit%': 0,
       'skia_angle%': 0,
-      'skia_chrome_utils%': 1,
       'skia_directwrite%': 0,
       'skia_gpu%': 1,
       'skia_osx_deployment_target%': '',
       'skia_profile_enabled%': 0,
       'skia_win_debuggers_path%': '',
       'skia_shared_lib%': 0,
       'skia_opencl%': 0,
       'skia_distancefield_fonts%': 0,
 
       # These variables determine the default optimization level for different
@@ skipping 63 matching lines @@
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
     'skia_run_pdfviewer_in_gm%': 0,
     'skia_disable_inlining%': 0,
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }