| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'conditions': [ | 3 'conditions': [ |
| 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
| 5 # Use the systemwide Qt libs by default | 5 # Use the systemwide Qt libs by default |
| 6 'variables': { | 6 'variables': { |
| 7 'qt_sdk%': '/usr', | 7 'qt_sdk%': '/usr', |
| 8 }, | 8 }, |
| 9 'qt_sdk': '<(qt_sdk)', | 9 'qt_sdk': '<(qt_sdk)', |
| 10 'qt_moc%': 'moc', | 10 'qt_moc%': 'moc', |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 '../debugger/SkDebugger.cpp', | 89 '../debugger/SkDebugger.cpp', |
| 90 '../src/utils/debugger/SkDebugCanvas.h', | 90 '../src/utils/debugger/SkDebugCanvas.h', |
| 91 '../src/utils/debugger/SkDebugCanvas.cpp', | 91 '../src/utils/debugger/SkDebugCanvas.cpp', |
| 92 '../src/utils/debugger/SkDrawCommand.h', | 92 '../src/utils/debugger/SkDrawCommand.h', |
| 93 '../src/utils/debugger/SkDrawCommand.cpp', | 93 '../src/utils/debugger/SkDrawCommand.cpp', |
| 94 '../src/utils/debugger/SkObjectParser.h', | 94 '../src/utils/debugger/SkObjectParser.h', |
| 95 '../src/utils/debugger/SkObjectParser.cpp', | 95 '../src/utils/debugger/SkObjectParser.cpp', |
| 96 ], | 96 ], |
| 97 'dependencies': [ | 97 'dependencies': [ |
| 98 'skia_lib.gyp:skia_lib', | 98 'skia_lib.gyp:skia_lib', |
| 99 'bench.gyp:bench_timer', |
| 99 'tools.gyp:picture_renderer', | 100 'tools.gyp:picture_renderer', |
| 100 'tools.gyp:timer', | |
| 101 ], | 101 ], |
| 102 'conditions': [ | 102 'conditions': [ |
| 103 [ 'skia_os == "nacl"', { | 103 [ 'skia_os == "nacl"', { |
| 104 'include_dirs': [ | 104 'include_dirs': [ |
| 105 '../src/utils', | 105 '../src/utils', |
| 106 ], | 106 ], |
| 107 'sources': [ | 107 'sources': [ |
| 108 '../platform_tools/nacl/src/nacl_debugger.cpp', | 108 '../platform_tools/nacl/src/nacl_debugger.cpp', |
| 109 ], | 109 ], |
| 110 }, { # skia_os != "nacl" | 110 }, { # skia_os != "nacl" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 '<(RULE_INPUT_PATH)', | 183 '<(RULE_INPUT_PATH)', |
| 184 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 184 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 185 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', | 185 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', |
| 186 }, | 186 }, |
| 187 ], | 187 ], |
| 188 }, | 188 }, |
| 189 ], | 189 ], |
| 190 }], | 190 }], |
| 191 ], | 191 ], |
| 192 } | 192 } |
| OLD | NEW |