Index: gyp/common_variables.gypi |
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi |
index 26b9961be457195471c80dc668288f355d1a33fc..c06666d89a50fa6477f19084f887ad4fe85f5df8 100644 |
--- a/gyp/common_variables.gypi |
+++ b/gyp/common_variables.gypi |
@@ -45,21 +45,13 @@ |
# 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, |
}, { |
@@ -117,8 +109,7 @@ |
'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, |
}, { |
@@ -154,7 +145,6 @@ |
'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)', |