Hopefully this fixes the flaky Android build.
Review URL: https://codereview.appspot.com/6461067
git-svn-id: http://skia.googlecode.com/svn/trunk@5032
2bbb7eff-a529-9590-31e7-
b0007b416f81
--- /dev/null
+# This GYP file stores the dependencies necessary to build Skia on the Android
+# platform. The OS doesn't provide many stable libraries as part of the
+# distribution so we have to build a few of them ourselves.
+#
+# We tried adding this gyp file to the android directory at the root of
+# the Skia repo, but that resulted in the generated makefiles being created
+# outside of the intended output directory. So to avoid this we created a simple
+# shim here that includes the android_deps.gypi file. The actual dependencies
+# are defined and maintained in that gypi file.
+#
+# Also this assumes that the android directory is a sibling to the directory
+# that contains your primary Skia checkout. If it is not then you must manually
+# edit the includes below to specify the actual location of the android.gypi.
+# This is due to the fact that we cannot use variables in an includes as the
+# variable expansion step for gyp happens after the includes are processed.
+{
+ 'includes': [
+ '../../android/gyp/dependencies.gypi',
+ ],
+}
'conditions': [
[ 'skia_os == "android" and android_make_apk == 1', {
'dependencies': [
- 'android_system.gyp:Android_EntryPoint',
+ 'android_deps.gyp:Android_EntryPoint',
],
}],
],
}],
[ 'skia_os == "android"', {
'dependencies': [
- 'android_system.gyp:ft2',
+ 'android_deps.gyp:ft2',
],
}],
[ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
'sources!': [
],
'dependencies': [
- 'android_system.gyp:gif',
- 'android_system.gyp:png',
+ 'android_deps.gyp:gif',
+ 'android_deps.gyp:png',
],
'defines': [
'SK_ENABLE_LIBPNG',
#TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds
],
'dependencies': [
- 'android_system.gyp:ft2',
- 'android_system.gyp:expat',
+ 'android_deps.gyp:ft2',
+ 'android_deps.gyp:expat',
],
}],
],