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/bench.gyp b/gyp/bench.gyp
index 7a413e1..1524b72 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -15,11 +15,9 @@
'bench.gypi'
],
'dependencies': [
- 'core.gyp:core',
+ 'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
- 'ports.gyp:ports',
- 'utils.gyp:utils',
'bench_timer',
],
'conditions': [
@@ -28,10 +26,6 @@
'include_dirs' : [
'../src/gpu',
],
- 'dependencies': [
- 'gpu.gyp:gr',
- 'gpu.gyp:skgr',
- ],
},
],
],
@@ -54,7 +48,7 @@
'../src/gpu',
],
'dependencies': [
- 'core.gyp:core',
+ 'skia_base_libs.gyp:skia_base_libs',
],
'conditions': [
[ 'skia_os not in ["mac", "ios"]', {
@@ -83,9 +77,6 @@
],
}],
['skia_gpu == 1', {
- 'dependencies': [
- 'gpu.gyp:gr',
- ],
'sources': [
'../bench/BenchGpuTimer_gl.h',
'../bench/BenchGpuTimer_gl.cpp',