OLD | NEW |
1 # | 1 # |
2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 188 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
189 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', | 189 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', |
190 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', | 190 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', |
191 '<(DEPTH)/third_party/ots/ots.gyp:ots', | 191 '<(DEPTH)/third_party/ots/ots.gyp:ots', |
192 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', | 192 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', |
193 '<(DEPTH)/url/url.gyp:url_lib', | 193 '<(DEPTH)/url/url.gyp:url_lib', |
194 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 194 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
195 'platform_generated.gyp:make_platform_generated', | 195 'platform_generated.gyp:make_platform_generated', |
196 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', | 196 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', |
197 '<(libjpeg_gyp_path):libjpeg', | 197 '<(libjpeg_gyp_path):libjpeg', |
| 198 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry' |
198 ], | 199 ], |
199 'export_dependent_settings': [ | 200 'export_dependent_settings': [ |
200 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', | 201 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', |
201 '<(DEPTH)/skia/skia.gyp:skia', | 202 '<(DEPTH)/skia/skia.gyp:skia', |
202 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', | 203 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', |
203 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', | 204 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', |
204 '<(DEPTH)/third_party/ots/ots.gyp:ots', | 205 '<(DEPTH)/third_party/ots/ots.gyp:ots', |
205 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', | 206 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', |
206 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 207 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
207 '<(DEPTH)/url/url.gyp:url_lib', | 208 '<(DEPTH)/url/url.gyp:url_lib', |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 ['OS=="android"', { | 460 ['OS=="android"', { |
460 'cflags!': ['-mthumb'], | 461 'cflags!': ['-mthumb'], |
461 }], | 462 }], |
462 ], | 463 ], |
463 },{ # target_arch!="arm" | 464 },{ # target_arch!="arm" |
464 'type': 'none', | 465 'type': 'none', |
465 }], | 466 }], |
466 ], | 467 ], |
467 }], | 468 }], |
468 } | 469 } |
OLD | NEW |