| Index: mojo/public/tools/bindings/chromium_bindings_configuration.gni
|
| diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
|
| index a18343687724baa4762be74f0e4bbf569ba9cdca..713de0e5718630baacf08fb2ac1d1f6c2787df38 100644
|
| --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
|
| +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
|
| @@ -9,6 +9,7 @@ _typemap_imports = [
|
| "//chrome/common/importer/typemaps.gni",
|
| "//components/arc/common/typemaps.gni",
|
| "//components/metrics/public/cpp/typemaps.gni",
|
| + "//components/printing/common/typemaps.gni",
|
| "//components/typemaps.gni",
|
| "//content/common/bluetooth/typemaps.gni",
|
| "//content/common/indexed_db/typemaps.gni",
|
| @@ -38,8 +39,6 @@ _typemap_imports = [
|
| "//url/mojo/typemaps.gni",
|
| ]
|
|
|
| -_typemap_imports_mac = [ "//content/common/typemaps_mac.gni" ]
|
| -
|
| _typemaps = []
|
| foreach(typemap_import, _typemap_imports) {
|
| # Avoid reassignment error by assigning to empty scope first.
|
| @@ -54,6 +53,9 @@ foreach(typemap, _typemaps) {
|
| typemaps += [ read_file(typemap, "scope") ]
|
| }
|
|
|
| +# Mac-specific typemaps
|
| +_typemap_imports_mac = [ "//content/common/typemaps_mac.gni" ]
|
| +
|
| _typemaps_mac = []
|
| foreach(typemap_import, _typemap_imports_mac) {
|
| _imported = {
|
| @@ -66,3 +68,19 @@ typemaps_mac = []
|
| foreach(typemap, _typemaps_mac) {
|
| typemaps_mac += [ read_file(typemap, "scope") ]
|
| }
|
| +
|
| +# Windows-specific typemaps
|
| +_typemap_imports_win = [ "//components/printing/common/typemaps_win.gni" ]
|
| +
|
| +_typemaps_win = []
|
| +foreach(typemap_import, _typemap_imports_win) {
|
| + _imported = {
|
| + }
|
| + _imported = read_file(typemap_import, "scope")
|
| + _typemaps_win += _imported.typemaps
|
| +}
|
| +
|
| +typemaps_win = []
|
| +foreach(typemap, _typemaps_win) {
|
| + typemaps_win += [ read_file(typemap, "scope") ]
|
| +}
|
|
|