| OLD | NEW | 
|---|
| 1 # Build ALMOST everything provided by Skia; this should be the default target. | 1 # Build ALMOST everything provided by Skia; this should be the default target. | 
| 2 # | 2 # | 
| 3 # This omits the following targets that many developers won't want to build: | 3 # This omits the following targets that many developers won't want to build: | 
| 4 # - debugger: this requires QT to build | 4 # - debugger: this requires QT to build | 
| 5 # | 5 # | 
| 6 { | 6 { | 
| 7   'variables': { | 7   'variables': { | 
| 8     'skia_skip_gui%': 0, | 8     'skia_skip_gui%': 0, | 
| 9   }, | 9   }, | 
| 10   'targets': [ | 10   'targets': [ | 
| 11     { | 11     { | 
| 12       'target_name': 'most', | 12       'target_name': 'most', | 
| 13       'type': 'none', | 13       'type': 'none', | 
| 14       'dependencies': [ | 14       'dependencies': [ | 
| 15         # The minimal set of static libraries for basic Skia functionality. | 15         # The minimal set of static libraries for basic Skia functionality. | 
| 16         'skia_lib.gyp:skia_lib', | 16         'skia_lib.gyp:skia_lib', | 
| 17 | 17 | 
| 18         'bench.gyp:*', | 18         'bench.gyp:*', | 
|  | 19         'example.gyp:HelloWorld', | 
| 19         'SampleApp.gyp:SampleApp', | 20         'SampleApp.gyp:SampleApp', | 
| 20         'tools.gyp:tools', | 21         'tools.gyp:tools', | 
| 21         'pathops_unittest.gyp:*', | 22         'pathops_unittest.gyp:*', | 
| 22         'pathops_skpclip.gyp:*', | 23         'pathops_skpclip.gyp:*', | 
| 23 #       'pdfviewer.gyp:pdfviewer', | 24 #       'pdfviewer.gyp:pdfviewer', | 
| 24         'dm.gyp:dm', | 25         'dm.gyp:dm', | 
| 25       ], | 26       ], | 
| 26       'conditions': [ | 27       'conditions': [ | 
|  | 28         [ 'skia_gpu == 0 or skia_os == "android"', { | 
|  | 29           'dependencies!': [ | 
|  | 30             'example.gyp:HelloWorld', | 
|  | 31           ], | 
|  | 32         }], | 
| 27         ['skia_os == "android"', { | 33         ['skia_os == "android"', { | 
| 28           'dependencies': [ 'android_system.gyp:SampleApp_APK' ], | 34           'dependencies': [ 'android_system.gyp:SampleApp_APK' ], | 
| 29         }], | 35         }], | 
| 30         ['skia_os == "ios"', { | 36         ['skia_os == "ios"', { | 
| 31           'dependencies!': [ 'SampleApp.gyp:SampleApp' ], | 37           'dependencies!': [ | 
|  | 38             'example.gyp:HelloWorld', | 
|  | 39             'SampleApp.gyp:SampleApp', | 
|  | 40           ], | 
| 32           'dependencies': ['iOSShell.gyp:iOSShell' ], | 41           'dependencies': ['iOSShell.gyp:iOSShell' ], | 
| 33         }], | 42         }], | 
| 34         ['skia_os == "mac" or skia_os == "linux"', { | 43         ['skia_os == "mac" or skia_os == "linux"', { | 
| 35           'dependencies': [ 'nanomsg.gyp:*' ], | 44           'dependencies': [ 'nanomsg.gyp:*' ], | 
| 36         }], | 45         }], | 
| 37         [ 'skia_skip_gui', | 46         [ 'skia_skip_gui', | 
| 38           { | 47           { | 
| 39             'dependencies!': [ | 48             'dependencies!': [ | 
|  | 49               'example.gyp:HelloWorld', | 
| 40               'SampleApp.gyp:SampleApp', | 50               'SampleApp.gyp:SampleApp', | 
| 41             ] | 51             ] | 
| 42           } | 52           } | 
| 43         ] | 53         ] | 
| 44       ], | 54       ], | 
| 45     }, | 55     }, | 
| 46   ], | 56   ], | 
| 47 } | 57 } | 
| OLD | NEW | 
|---|