Build Skia as a static library
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049
git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 3920152..c33c67f 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -135,12 +135,10 @@
'../samplecode/SampleFontCache.cpp',
],
'dependencies': [
- 'core.gyp:core',
+ 'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
- 'ports.gyp:ports',
'views.gyp:views',
- 'utils.gyp:utils',
'animator.gyp:animator',
'xml.gyp:xml',
'experimental.gyp:experimental',
@@ -290,10 +288,6 @@
'include_dirs': [
'../src/gpu', # To pull gl/GrGLUtil.h
],
- 'dependencies': [
- 'gpu.gyp:gr',
- 'gpu.gyp:skgr',
- ],
}],
],
'msvs_settings': {