diff options
| author | sky <sky@chromium.org> | 2017-05-23 08:11:03 +0900 |
|---|---|---|
| committer | Qijiang Fan <fqj@google.com> | 2020-06-05 06:11:28 +0900 |
| commit | be04e4d74aadf7e28eda8a6433b5ddc78abc550f (patch) | |
| tree | c56d27232e382ab679a91d9b2bc3fd81c0311b8f /mojo/public/tools/bindings/chromium_bindings_configuration.gni | |
| parent | 79467025e9c7fb352f147a8dcaf188c02bdda51e (diff) | |
| download | libchrome-be04e4d74aadf7e28eda8a6433b5ddc78abc550f.tar.gz | |
chromeos: adds TouchDeviceServer and wires up in mushrome
TouchDeviceServer is necessary for hooking up AshTouchTransformController in mus/mash.
BUG=705686
TEST=covered by tests
R=erg@chromium.org,rockot@chromium.org,tsepez@chromium.org
Review-Url: https://codereview.chromium.org/2901563002
Cr-Original-Commit-Position: refs/heads/master@{#473651}
Committed: https://chromium.googlesource.com/chromium/src/+/68e20f488cc2ea0216832c8fe3640d9b748595d2
Review-Url: https://codereview.chromium.org/2901563002
Cr-Commit-Position: refs/heads/master@{#473734}
CrOS-Libchrome-Original-Commit: 7265b1cc285ca137198ba1f2d75bfc649aa2c3a3
Diffstat (limited to 'mojo/public/tools/bindings/chromium_bindings_configuration.gni')
| -rw-r--r-- | mojo/public/tools/bindings/chromium_bindings_configuration.gni | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni index 6fe0750fec..945a7814ea 100644 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni @@ -48,6 +48,9 @@ _typemap_imports = [ _typemap_imports_mac = [ "//content/common/typemaps_mac.gni" ] +_typemap_imports_chromeos = + [ "//ui/display/manager/chromeos/mojo/typemaps.gni" ] + _typemaps = [] foreach(typemap_import, _typemap_imports) { # Avoid reassignment error by assigning to empty scope first. @@ -81,4 +84,20 @@ foreach(typemap, _typemaps_mac) { } ] } +_typemaps_chromeos = [] +foreach(typemap_import, _typemap_imports_chromeos) { + _imported = { + } + _imported = read_file(typemap_import, "scope") + _typemaps_chromeos += _imported.typemaps +} + +typemaps_chromeos = [] +foreach(typemap, _typemaps_chromeos) { + typemaps_chromeos += [ { + filename = typemap + config = read_file(typemap, "scope") + } ] +} + component_macro_suffix = "" |