| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'targets': [ | 6   'targets': [ | 
| 7     { | 7     { | 
| 8       'target_name': 'forwarder2', | 8       'target_name': 'forwarder2', | 
| 9       'type': 'none', | 9       'type': 'none', | 
| 10       'dependencies': [ | 10       'dependencies': [ | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 31           'cflags': [ | 31           'cflags': [ | 
| 32             '-fPIE', | 32             '-fPIE', | 
| 33           ], | 33           ], | 
| 34           'ldflags': [ | 34           'ldflags': [ | 
| 35             '-pie', | 35             '-pie', | 
| 36           ], | 36           ], | 
| 37         }], | 37         }], | 
| 38       ], | 38       ], | 
| 39       'sources': [ | 39       'sources': [ | 
| 40         'command.cc', | 40         'command.cc', | 
|  | 41         'common.cc', | 
| 41         'device_controller.cc', | 42         'device_controller.cc', | 
| 42         'device_forwarder_main.cc', | 43         'device_forwarder_main.cc', | 
| 43         'device_listener.cc', | 44         'device_listener.cc', | 
| 44         'forwarder.cc', | 45         'forwarder.cc', | 
| 45         'pipe_notifier.cc', | 46         'pipe_notifier.cc', | 
| 46         'socket.cc', | 47         'socket.cc', | 
| 47         'thread.cc', | 48         'thread.cc', | 
| 48       ], | 49       ], | 
| 49     }, | 50     }, | 
| 50     { | 51     { | 
| 51       'target_name': 'host_forwarder', | 52       'target_name': 'host_forwarder', | 
| 52       'type': 'executable', | 53       'type': 'executable', | 
| 53       'toolsets': ['host'], | 54       'toolsets': ['host'], | 
| 54       'dependencies': [ | 55       'dependencies': [ | 
| 55         '../../../base/base.gyp:base', | 56         '../../../base/base.gyp:base', | 
| 56         '../common/common.gyp:android_tools_common', | 57         '../common/common.gyp:android_tools_common', | 
| 57       ], | 58       ], | 
| 58       'include_dirs': [ | 59       'include_dirs': [ | 
| 59         '../../..', | 60         '../../..', | 
| 60       ], | 61       ], | 
| 61       'sources': [ | 62       'sources': [ | 
| 62         'command.cc', | 63         'command.cc', | 
|  | 64         'common.cc', | 
|  | 65         'daemon.cc', | 
| 63         'forwarder.cc', | 66         'forwarder.cc', | 
| 64         'host_controller.cc', | 67         'host_controller.cc', | 
| 65         'host_forwarder_main.cc', | 68         'host_forwarder_main.cc', | 
| 66         'pipe_notifier.cc', | 69         'pipe_notifier.cc', | 
| 67         'socket.cc', | 70         'socket.cc', | 
| 68         'thread.cc', | 71         'thread.cc', | 
| 69       ], | 72       ], | 
| 70     }, | 73     }, | 
| 71   ], | 74   ], | 
| 72 } | 75 } | 
| OLD | NEW | 
|---|