diff options
| author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-10 19:45:51 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-10 19:45:51 +0000 |
| commit | 0dcb15d7481fd888e9a0e26a1d17744caccadf97 (patch) | |
| tree | a5453b732a8fca172700c8bdcffbf512e9b05ec3 /common_conditions.gypi | |
| parent | f2759321a95e1fbd2a53c5db114b28dceb2cf3b0 (diff) | |
| download | gyp-0dcb15d7481fd888e9a0e26a1d17744caccadf97.tar.gz | |
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/gyp@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common_conditions.gypi')
| -rw-r--r-- | common_conditions.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi index f8f283b..e8e2fca 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -324,7 +324,6 @@ 'SK_USE_POSIX_THREADS' ], }], - ], # end 'conditions' # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 'xcode_settings': { |