summaryrefslogtreecommitdiff
path: root/mojo/public/tools/bindings/chromium_bindings_configuration.gni
diff options
context:
space:
mode:
authormek <mek@chromium.org>2017-05-23 04:50:48 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 06:11:19 +0900
commit092d7c1dc21d9fae9895b81471acdcb0026a1597 (patch)
tree7fe649a0b7220932e355d6e02bce7972ad72a4bc /mojo/public/tools/bindings/chromium_bindings_configuration.gni
parentf7f1382c5e87b56f3f23131eafabb8b17cb18181 (diff)
downloadlibchrome-092d7c1dc21d9fae9895b81471acdcb0026a1597.tar.gz
Revert of chromeos: adds TouchDeviceServer and wires up in mushrome (patchset #1 id:1 of https://codereview.chromium.org/2901563002/ )
Reason for revert: Failed compile on https://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20x86-generic%20Compile/builds/35937: /b/c/goma_client/gomacc i686-pc-linux-gnu-g++ -B/b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+target_toolchain/usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/binutils-bin/2.25.51-gold -MMD -MF obj/ash/ash/shell_port_classic.o.d -DASH_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_ASH=1 -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -DOS_CHROMEOS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DUSE_EGL -DTOOLKIT_VIEWS=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DMESA_EGL_NO_X11_HEADERS -I../.. -Igen -I../../third_party/libwebp -I../../third_party/khronos -I../../gpu -I../../third_party/ced/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/third_party/vulkan -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I/b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/include/dbus-1.0 -I/b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/lib/dbus-1.0/include -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/libwebm/source -I../../third_party/boringssl/src/include -I/b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/include/nss -I/b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/include/nspr -I../../third_party/WebKit -Igen/third_party/WebKit -I../../v8/include -Igen/v8/include -I../../third_party/qcms/src -Igen -I../../third_party/mesa/src/include -fno-strict-aliasing -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -B../../third_party/binutils/Linux_x64/Release/bin -m32 -msse2 -mfpmath=sse -mmmx -pthread -Wall -Werror -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g2 -gsplit-dwarf --sysroot=../../../.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz -fvisibility=hidden -std=gnu++11 -Wno-narrowing -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -march=i686 -pipe -march=i686 -pipe -pipe -march=i686 -mfpmath=sse -mmmx -msse -msse2 -msse3 -D__google_stl_debug_vector=1 -c ../../ash/aura/shell_port_classic.cc -o obj/ash/ash/shell_port_classic.o ../../ash/aura/shell_port_classic.cc: In member function 'virtual std::unique_ptr<display::TouchTransformSetter> ash::ShellPortClassic::CreateTouchTransformDelegate()': ../../ash/aura/shell_port_classic.cc:126:10: error: cannot bind 'std::unique_ptr<display::DefaultTouchTransformSetter>' lvalue to 'std::unique_ptr<display::DefaultTouchTransformSetter>&&' return delegate; ^ In file included from /b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+target_toolchain/usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.9.x/../../../../lib/gcc/i686-pc-linux-gnu/4.9.x/include/g++-v4/memory:81:0, from ../../ash/aura/shell_port_classic.h:8, from ../../ash/aura/shell_port_classic.cc:5: /b/c/b/ChromiumOS_x86_generic_Compile/.cros_cache/chrome-sdk/tarballs/x86-generic+9536.0.0+target_toolchain/usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.9.x/../../../../lib/gcc/i686-pc-linux-gnu/4.9.x/include/g++-v4/bits/unique_ptr.h:220:2: note: initializing argument 1 of 'std::unique_ptr<_Tp, _Dp>::unique_ptr(std::unique_ptr<_Up, _Ep>&&) [with _Up = display::DefaultTouchTransformSetter; _Ep = std::default_delete<display::DefaultTouchTransformSetter>; <template-parameter-2-3> = void; _Tp = display::TouchTransformSetter; _Dp = std::default_delete<display::TouchTransformSetter>]' unique_ptr(unique_ptr<_Up, _Ep>&& __u) noexcept ^ ../../ash/aura/shell_port_classic.cc:127:1: error: control reaches end of non-void function [-Werror=return-type] } ^ Original issue's description: > 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-Commit-Position: refs/heads/master@{#473651} > Committed: https://chromium.googlesource.com/chromium/src/+/68e20f488cc2ea0216832c8fe3640d9b748595d2 TBR=rockot@chromium.org,erg@chromium.org,tsepez@chromium.org,sky@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=705686 Review-Url: https://codereview.chromium.org/2897863004 Cr-Commit-Position: refs/heads/master@{#473662} CrOS-Libchrome-Original-Commit: d99444dbb09468ef53fc699708c0b68afb451baa
Diffstat (limited to 'mojo/public/tools/bindings/chromium_bindings_configuration.gni')
-rw-r--r--mojo/public/tools/bindings/chromium_bindings_configuration.gni19
1 files changed, 0 insertions, 19 deletions
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
index 945a7814ea..6fe0750fec 100644
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -48,9 +48,6 @@ _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.
@@ -84,20 +81,4 @@ 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 = ""