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
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',
+ ],
},
],
}
