Gyp file changes for the android framework.

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 27 matching lines @@
   'variables': {  # level 1
     'variables': {  # level 2
 
       # Variables needed by conditions list within the level-2 variables dict.
       'variables': {  # level 3
         # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
         # for cross-compilation (e.g. building for either MacOS or iOS on Mac).
         # We set it automatically based on 'OS' (the host OS), but allow the
         # user to override it via GYP_DEFINES if they like.
         'skia_os%': '<(OS)',
-
-        'skia_android_framework%': 0,
       },
 
       # 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)',
+      'skia_os%': '<(skia_os)',
 
       'conditions': [
-        [ 'skia_android_framework == 1', {
-          'skia_os%': 'android',
-        }, {
-          'skia_os%': '<(skia_os)',
-        }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux", "win"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
         }],
@@ skipping 37 matching lines @@
       'skia_distancefield_fonts%': 0,
 
       # These variables determine the default optimization level for different
       # compilers.
       'skia_default_vs_optimization_level': 3, # full (/Ox)
       'skia_default_gcc_optimization_level': 3, # -O3
     },
 
     'conditions': [
       [ 'skia_os == "win" and skia_arch_width == 32 or '
-        'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"] '
-            'and skia_android_framework == 0 or '
+        'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"] or '
         'skia_os == "mac" and skia_arch_width == 32', {
         'skia_warnings_as_errors%': 1,
       }, {
         'skia_warnings_as_errors%': 0,
       }],
 
       # This variable allows the user to customize the optimization level used
       # by the compiler.  The user should be aware that this has different
       # meanings for different compilers and should exercise caution when
       # overriding it.
@@ skipping 15 matching lines @@
     # so that siblings of the level-1 'variables' dict can see them.
     'arm_version%': '<(arm_version)',
     'arm_neon%': '<(arm_neon)',
     'arm_neon_optional%': 0,
     'skia_os%': '<(skia_os)',
     'os_posix%': '<(os_posix)',
     'skia_sanitizer%': '<(skia_sanitizer)',
     'skia_scalar%': '<(skia_scalar)',
     'skia_mesa%': '<(skia_mesa)',
     'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
-    'skia_android_framework%': '<(skia_android_framework)',
     'skia_android_path_rendering%': '<(skia_android_path_rendering)',
     'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
     'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
     'skia_angle%': '<(skia_angle)',
     'skia_poppler_enabled%': '<(skia_poppler_enabled)',
     'skia_arch_width%': '<(skia_arch_width)',
     'skia_arch_type%': '<(skia_arch_type)',
     'skia_chrome_utils%': '<(skia_chrome_utils)',
     'skia_directwrite%': '<(skia_directwrite)',
     'skia_gpu%': '<(skia_gpu)',
     'skia_win_exceptions%': 0,
     'skia_osx_deployment_target%': '<(skia_osx_deployment_target)',
     'skia_profile_enabled%': '<(skia_profile_enabled)',
     'skia_shared_lib%': '<(skia_shared_lib)',
     'skia_opencl%': '<(skia_opencl)',
     'skia_distancefield_fonts%': '<(skia_distancefield_fonts)',
     'skia_static_initializers%': '<(skia_static_initializers)',
     'ios_sdk_version%': '6.0',
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
     'skia_run_pdfviewer_in_gm%': 0,
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }