diff options
| author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-18 14:59:54 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-18 14:59:54 +0000 |
| commit | b33a8eac1583adcda7cc33fc8a62bac073a6a0bd (patch) | |
| tree | 6ee13821ef9df59632999c47900cc1608227cb4c | |
| parent | be76d3d1f08541ed4b8d66641756a5e989e17f9c (diff) | |
| download | gyp-b33a8eac1583adcda7cc33fc8a62bac073a6a0bd.tar.gz | |
Enable Compile Option to Build Android Executables
Since we can't debug APKs on 4.1, we sometimes need to
build Skia the old way for Android. This CL enables
a switch to do so.
Review URL: https://codereview.appspot.com/6408053
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@4653 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | apptype_console.gypi | 2 | ||||
| -rw-r--r-- | common_variables.gypi | 2 | ||||
| -rw-r--r-- | effects.gyp | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apptype_console.gypi b/apptype_console.gypi index 6971b6a..62f1b9f 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -12,7 +12,7 @@ }, }, 'conditions': [ - [ 'skia_os == "android"', { + [ 'skia_os == "android" and android_make_apk == 1', { 'dependencies': [ 'android_system.gyp:Android_EntryPoint', ], diff --git a/common_variables.gypi b/common_variables.gypi index ee00a34..88e710e 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -66,6 +66,7 @@ 'skia_angle%': 0, 'skia_arch_type%': 'x86', 'skia_arch_width%': 32, + 'android_make_apk%': 1, }, # Re-define all variables defined within the level-2 'variables' dict, @@ -78,6 +79,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', + 'android_make_apk%': '<(android_make_apk)', }, } # Local Variables: diff --git a/effects.gyp b/effects.gyp index cb15a2a..a551ceb 100644 --- a/effects.gyp +++ b/effects.gyp @@ -4,10 +4,7 @@ 'target_name': 'effects', 'type': 'static_library', 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', - '../include/gpu', '../src/gpu', ], 'sources': [ @@ -87,6 +84,10 @@ '../include/effects', ], }, + 'dependencies': [ + 'core.gyp:core', + 'gpu.gyp:gr', + ], }, ], } |