| 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': [ | 
| 11         'device_forwarder', | 11         'device_forwarder', | 
| 12         'host_forwarder#host', | 12         'host_forwarder#host', | 
| 13       ], | 13       ], | 
| 14       # For the component build, ensure dependent shared libraries are stripped | 14       # For the component build, ensure dependent shared libraries are stripped | 
| 15       # and put alongside forwarder to simplify pushing to the device. | 15       # and put alongside forwarder to simplify pushing to the device. | 
| 16       'variables': { | 16       'variables': { | 
| 17          'output_dir': '<(PRODUCT_DIR)/forwarder_dist/', | 17          'output_dir': '<(PRODUCT_DIR)/forwarder_dist/', | 
| 18          'native_binary': '<(PRODUCT_DIR)/device_forwarder', | 18          'native_binary': '<(PRODUCT_DIR)/device_forwarder', | 
| 19       }, | 19       }, | 
| 20       'includes': ['../../../build/android/native_app_dependencies.gypi'], | 20       'includes': ['../../../build/android/native_app_dependencies.gypi'], | 
| 21     }, | 21     }, | 
| 22     { | 22     { | 
| 23       'target_name': 'device_forwarder', | 23       'target_name': 'device_forwarder', | 
| 24       'type': 'executable', | 24       'type': 'executable', | 
| 25       'toolsets': ['target'], | 25       'toolsets': ['target'], | 
| 26       'dependencies': [ | 26       'dependencies': [ | 
| 27         '../../../base/base.gyp:base', | 27         '../../../base/base.gyp:base', | 
|  | 28         '../../../build/android/pylib/device/commands/commands.gyp:chromium_comm
    ands', | 
| 28         '../common/common.gyp:android_tools_common', | 29         '../common/common.gyp:android_tools_common', | 
| 29       ], | 30       ], | 
| 30       'include_dirs': [ | 31       'include_dirs': [ | 
| 31         '../../..', | 32         '../../..', | 
| 32       ], | 33       ], | 
| 33       'sources': [ | 34       'sources': [ | 
| 34         'command.cc', | 35         'command.cc', | 
| 35         'common.cc', | 36         'common.cc', | 
| 36         'daemon.cc', | 37         'daemon.cc', | 
| 37         'device_controller.cc', | 38         'device_controller.cc', | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 61         'forwarder.cc', | 62         'forwarder.cc', | 
| 62         'forwarders_manager.cc', | 63         'forwarders_manager.cc', | 
| 63         'host_controller.cc', | 64         'host_controller.cc', | 
| 64         'host_forwarder_main.cc', | 65         'host_forwarder_main.cc', | 
| 65         'pipe_notifier.cc', | 66         'pipe_notifier.cc', | 
| 66         'socket.cc', | 67         'socket.cc', | 
| 67       ], | 68       ], | 
| 68     }, | 69     }, | 
| 69   ], | 70   ], | 
| 70 } | 71 } | 
| OLD | NEW | 
|---|