| 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//extensions/extensions.gni") | 6 import("//extensions/extensions.gni") |
| 7 import("//mojo/public/tools/bindings/mojom.gni") | 7 import("//mojo/public/tools/bindings/mojom.gni") |
| 8 | 8 |
| 9 # GYP version: extensions/extensions.gyp:extensions_common_constants | 9 # GYP version: extensions/extensions.gyp:extensions_common_constants |
| 10 source_set("common_constants") { | 10 source_set("common_constants") { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 sources = rebase_path(extensions_gypi_values.extensions_common_mojo_sources, | 22 sources = rebase_path(extensions_gypi_values.extensions_common_mojo_sources, |
| 23 ".", | 23 ".", |
| 24 "//extensions") | 24 "//extensions") |
| 25 if (proprietary_codecs && enable_wifi_display) { | 25 if (proprietary_codecs && enable_wifi_display) { |
| 26 wifi_display_sources = rebase_path( | 26 wifi_display_sources = rebase_path( |
| 27 extensions_gypi_values.extensions_common_mojo_sources_wifi_display
, | 27 extensions_gypi_values.extensions_common_mojo_sources_wifi_display
, |
| 28 ".", | 28 ".", |
| 29 "//extensions") | 29 "//extensions") |
| 30 sources += wifi_display_sources | 30 sources += wifi_display_sources |
| 31 } | 31 } |
| 32 |
| 33 use_new_wrapper_types = false |
| 32 } | 34 } |
| 33 | 35 |
| 34 # GYP version: extensions/extensions.gyp:extensions_common | 36 # GYP version: extensions/extensions.gyp:extensions_common |
| 35 # This must be a static library because extensions common depends on | 37 # This must be a static library because extensions common depends on |
| 36 # GetTrustedICAPublicKey in extensions/browser which isn't always linked | 38 # GetTrustedICAPublicKey in extensions/browser which isn't always linked |
| 37 # in. TODO(brettw): This reverse dependency should be fixed. | 39 # in. TODO(brettw): This reverse dependency should be fixed. |
| 38 static_library("common") { | 40 static_library("common") { |
| 39 sources = rebase_path(extensions_gypi_values.extensions_common_sources, | 41 sources = rebase_path(extensions_gypi_values.extensions_common_sources, |
| 40 ".", | 42 ".", |
| 41 "//extensions") | 43 "//extensions") |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 84 |
| 83 if (enable_nacl) { | 85 if (enable_nacl) { |
| 84 nacl_sources = | 86 nacl_sources = |
| 85 rebase_path(extensions_gypi_values.extensions_common_sources_nacl, | 87 rebase_path(extensions_gypi_values.extensions_common_sources_nacl, |
| 86 ".", | 88 ".", |
| 87 "//extensions") | 89 "//extensions") |
| 88 sources += nacl_sources | 90 sources += nacl_sources |
| 89 } | 91 } |
| 90 } | 92 } |
| 91 } # enable_extensions | 93 } # enable_extensions |
| OLD | NEW |