| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 '../../build/linux/system.gyp:dbus', | 120 '../../build/linux/system.gyp:dbus', |
| 121 '../../chromeos/chromeos.gyp:chromeos', | 121 '../../chromeos/chromeos.gyp:chromeos', |
| 122 '../../dbus/dbus.gyp:dbus', | 122 '../../dbus/dbus.gyp:dbus', |
| 123 ], | 123 ], |
| 124 'export_dependent_settings': [ | 124 'export_dependent_settings': [ |
| 125 '../../build/linux/system.gyp:dbus' | 125 '../../build/linux/system.gyp:dbus' |
| 126 ] | 126 ] |
| 127 }], | 127 }], |
| 128 ['OS == "android"', { | 128 ['OS == "android"', { |
| 129 'dependencies': [ | 129 'dependencies': [ |
| 130 'device_bluetooth_java', |
| 130 'device_bluetooth_jni_headers', | 131 'device_bluetooth_jni_headers', |
| 131 ], | 132 ], |
| 132 'sources': [ | 133 'sources': [ |
| 133 'android/bluetooth_jni_registrar.cc', | 134 'android/bluetooth_jni_registrar.cc', |
| 134 'android/bluetooth_jni_registrar.h', | 135 'android/bluetooth_jni_registrar.h', |
| 135 ], | 136 ], |
| 136 }], | 137 }], |
| 137 ['OS=="win"', { | 138 ['OS=="win"', { |
| 138 # The following two blocks are duplicated. They apply to static lib | 139 # The following two blocks are duplicated. They apply to static lib |
| 139 # and shared lib configurations respectively. | 140 # and shared lib configurations respectively. |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 ], | 253 ], |
| 253 'variables': { | 254 'variables': { |
| 254 'java_in_dir': '../../device/bluetooth/android/java', | 255 'java_in_dir': '../../device/bluetooth/android/java', |
| 255 }, | 256 }, |
| 256 'includes': [ '../../build/java.gypi' ], | 257 'includes': [ '../../build/java.gypi' ], |
| 257 }, | 258 }, |
| 258 ], | 259 ], |
| 259 }], | 260 }], |
| 260 ], | 261 ], |
| 261 } | 262 } |
| OLD | NEW |