Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/features.gni") | 4 import("//build/config/features.gni") |
| 5 | 5 |
| 6 if (is_android) { | 6 if (is_android) { |
| 7 import("//build/config/android/rules.gni") # For generate_jni(). | 7 import("//build/config/android/rules.gni") # For generate_jni(). |
| 8 } | 8 } |
| 9 | 9 |
| 10 config("bluetooth_config") { | 10 config("bluetooth_config") { |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 "discovery_session.h", | 34 "discovery_session.h", |
| 35 ] | 35 ] |
| 36 | 36 |
| 37 public_deps = [ | 37 public_deps = [ |
| 38 ":bluetooth", | 38 ":bluetooth", |
| 39 "//device/bluetooth/public/interfaces:experimental_interfaces", | 39 "//device/bluetooth/public/interfaces:experimental_interfaces", |
| 40 "//mojo/public/cpp/bindings", | 40 "//mojo/public/cpp/bindings", |
| 41 ] | 41 ] |
| 42 } | 42 } |
| 43 | 43 |
| 44 source_set("fake_bluetooth") { | |
| 45 sources = [ | |
| 46 "test/fake_bluetooth.cc", | |
| 47 "test/fake_bluetooth.h", | |
| 48 ] | |
| 49 | |
| 50 deps = [ | |
| 51 ":bluetooth", | |
| 52 "//device/bluetooth/public/interfaces:fake_bluetooth_interfaces", | |
| 53 "//mojo/public/cpp/bindings", | |
| 54 ] | |
| 55 } | |
| 56 | |
| 57 source_set("fake_bluetooth") { | |
|
scheib
2017/04/12 18:56:47
There's now a duplicate source_set fake_bluetooth
ortuno
2017/04/13 01:12:47
wat... I guess "git cl patch" messed up at some po
| |
| 58 sources = [ | |
| 59 "test/fake_bluetooth.cc", | |
| 60 "test/fake_bluetooth.h", | |
| 61 ] | |
| 62 | |
| 63 deps = [ | |
| 64 ":bluetooth", | |
| 65 "//device/bluetooth/public/interfaces:fake_bluetooth_interfaces", | |
| 66 "//mojo/public/cpp/bindings", | |
| 67 ] | |
| 68 } | |
| 69 | |
| 44 component("bluetooth") { | 70 component("bluetooth") { |
| 45 sources = [ | 71 sources = [ |
| 46 "android/bluetooth_jni_registrar.cc", | 72 "android/bluetooth_jni_registrar.cc", |
| 47 "android/bluetooth_jni_registrar.h", | 73 "android/bluetooth_jni_registrar.h", |
| 48 "android/wrappers.cc", | 74 "android/wrappers.cc", |
| 49 "android/wrappers.h", | 75 "android/wrappers.h", |
| 50 "bluetooth_adapter.cc", | 76 "bluetooth_adapter.cc", |
| 51 "bluetooth_adapter.h", | 77 "bluetooth_adapter.h", |
| 52 "bluetooth_adapter_android.cc", | 78 "bluetooth_adapter_android.cc", |
| 53 "bluetooth_adapter_android.h", | 79 "bluetooth_adapter_android.h", |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 } | 439 } |
| 414 | 440 |
| 415 android_library("java") { | 441 android_library("java") { |
| 416 java_files = java_sources_needing_jni | 442 java_files = java_sources_needing_jni |
| 417 deps = [ | 443 deps = [ |
| 418 "//base:base_java", | 444 "//base:base_java", |
| 419 "//components/location/android:location_java", | 445 "//components/location/android:location_java", |
| 420 ] | 446 ] |
| 421 } | 447 } |
| 422 } | 448 } |
| OLD | NEW |