| 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") { | 
| 11   sources = | 11   sources = | 
| 12       rebase_path(extensions_gypi_values.extensions_common_constants_sources, | 12       rebase_path(extensions_gypi_values.extensions_common_constants_sources, | 
| 13                   ".", | 13                   ".", | 
| 14                   "//extensions") | 14                   "//extensions") | 
| 15 | 15 | 
| 16   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 16   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 
| 17   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 17   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 
| 18 } | 18 } | 
| 19 | 19 | 
| 20 if (enable_extensions) { | 20 if (enable_extensions) { | 
| 21   mojom("mojo") { | 21   mojom("mojo") { | 
| 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 (enable_wifi_display) { | 
|  | 26       wifi_display_sources = rebase_path( | 
|  | 27               extensions_gypi_values.extensions_common_mojo_sources_wifi_display
    , | 
|  | 28               ".", | 
|  | 29               "//extensions") | 
|  | 30       sources += wifi_display_sources | 
|  | 31     } | 
| 25   } | 32   } | 
| 26 | 33 | 
| 27   # GYP version: extensions/extensions.gyp:extensions_common | 34   # GYP version: extensions/extensions.gyp:extensions_common | 
| 28   # This must be a static library because extensions common depends on | 35   # This must be a static library because extensions common depends on | 
| 29   # GetTrustedICAPublicKey in extensions/browser which isn't always linked | 36   # GetTrustedICAPublicKey in extensions/browser which isn't always linked | 
| 30   # in. TODO(brettw): This reverse dependency should be fixed. | 37   # in. TODO(brettw): This reverse dependency should be fixed. | 
| 31   static_library("common") { | 38   static_library("common") { | 
| 32     sources = rebase_path(extensions_gypi_values.extensions_common_sources, | 39     sources = rebase_path(extensions_gypi_values.extensions_common_sources, | 
| 33                           ".", | 40                           ".", | 
| 34                           "//extensions") | 41                           "//extensions") | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 73 | 80 | 
| 74     if (enable_nacl) { | 81     if (enable_nacl) { | 
| 75       nacl_sources = | 82       nacl_sources = | 
| 76           rebase_path(extensions_gypi_values.extensions_common_sources_nacl, | 83           rebase_path(extensions_gypi_values.extensions_common_sources_nacl, | 
| 77                       ".", | 84                       ".", | 
| 78                       "//extensions") | 85                       "//extensions") | 
| 79       sources += nacl_sources | 86       sources += nacl_sources | 
| 80     } | 87     } | 
| 81   } | 88   } | 
| 82 }  # enable_extensions | 89 }  # enable_extensions | 
| OLD | NEW | 
|---|