Chromium Code Reviews Chromium Code Reviews
Issue 1409033007:
Aura on Android: Stub implementation of UsbPrinterManifestHandler. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 | 4 |
| 5 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//extensions/extensions.gni") | 7 import("//extensions/extensions.gni") |
| 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") | 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") |
| 9 | 9 |
| 10 # GYP version: extensions/extensions.gyp:extensions_common_constants | 10 # GYP version: extensions/extensions.gyp:extensions_common_constants |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 deps = [ | 49 deps = [ |
| 50 # TODO(benwells): figure out what to do with the api target and | 50 # TODO(benwells): figure out what to do with the api target and |
| 51 # api resources compiled into the chrome resource bundle. | 51 # api resources compiled into the chrome resource bundle. |
| 52 # http://crbug.com/162530 | 52 # http://crbug.com/162530 |
| 53 "//chrome:resources", | 53 "//chrome:resources", |
| 54 "//components/crx_file", | 54 "//components/crx_file", |
| 55 "//components/url_matcher", | 55 "//components/url_matcher", |
| 56 "//content/public/common", | 56 "//content/public/common", |
| 57 "//crypto", | 57 "//crypto", |
| 58 "//device/bluetooth", | 58 "//device/bluetooth", |
| 59 "//device/usb", | |
| 60 "//extensions/common/api", | 59 "//extensions/common/api", |
| 61 "//extensions/strings", | 60 "//extensions/strings", |
| 62 "//extensions:extensions_resources", | 61 "//extensions:extensions_resources", |
| 63 "//ipc", | 62 "//ipc", |
| 64 "//net", | 63 "//net", |
| 65 "//third_party/boringssl", | 64 "//third_party/boringssl", |
| 66 "//third_party/icu", | 65 "//third_party/icu", |
| 67 "//third_party/libxml", | 66 "//third_party/libxml", |
| 68 "//third_party/re2", | 67 "//third_party/re2", |
| 69 "//ui/base", | 68 "//ui/base", |
| 70 "//ui/gfx/geometry", | 69 "//ui/gfx/geometry", |
| 71 "//ui/gfx/ipc", | 70 "//ui/gfx/ipc", |
| 72 "//url", | 71 "//url", |
| 73 ] | 72 ] |
| 74 | 73 |
| 74 if (!is_android) { | |
| 75 deps += [ "//device/usb" ] | |
|
mfomitchev
2015/11/03 15:23:29
Remove this conditionally rather than adding it co
Hadi
2015/11/03 16:31:53
Done.
| |
| 76 } else { | |
| 77 sources -= [ | |
| 78 "api/printer_provider/usb_printer_manifest_data.cc", | |
| 79 "api/printer_provider/usb_printer_manifest_data.h", | |
| 80 "api/printer_provider/usb_printer_manifest_handler.cc", | |
| 81 ] | |
| 82 sources += | |
| 83 [ "api/printer_provider/usb_printer_manifest_handler_android.cc" ] | |
|
mfomitchev
2015/11/03 15:23:29
Add this in gypi, then you won't need a special ru
Hadi
2015/11/03 16:31:53
Done.
| |
| 84 } | |
| 85 | |
| 75 if (enable_nacl) { | 86 if (enable_nacl) { |
| 76 nacl_sources = | 87 nacl_sources = |
| 77 rebase_path(extensions_gypi_values.extensions_common_sources_nacl, | 88 rebase_path(extensions_gypi_values.extensions_common_sources_nacl, |
| 78 ".", | 89 ".", |
| 79 "//extensions") | 90 "//extensions") |
| 80 sources += nacl_sources | 91 sources += nacl_sources |
| 81 } | 92 } |
| 82 } | 93 } |
| 83 } # enable_extensions | 94 } # enable_extensions |
| OLD | NEW |
