Commit 759ec5f5 authored by jamiewalch's avatar jamiewalch Committed by Commit Bot

Fix ChromeOS build.

BUG=731711

Review-Url: https://codereview.chromium.org/2928423003
Cr-Commit-Position: refs/heads/master@{#478824}
parent 74dc7cd2
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
#include "remoting/host/win/elevation_helpers.h" #include "remoting/host/win/elevation_helpers.h"
#endif // defined(OS_WIN) #endif // defined(OS_WIN)
#if defined(OS_LINUX) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include <glib-object.h> #include <glib-object.h>
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
using remoting::protocol::PairingRegistry; using remoting::protocol::PairingRegistry;
...@@ -64,14 +64,14 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) { ...@@ -64,14 +64,14 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) {
base::mac::ScopedNSAutoreleasePool pool; base::mac::ScopedNSAutoreleasePool pool;
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
#if defined(OS_LINUX) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// g_type_init will be deprecated in 2.36. 2.35 is the development // g_type_init will be deprecated in 2.36. 2.35 is the development
// version for 2.36, hence do not call g_type_init starting 2.35. // version for 2.36, hence do not call g_type_init starting 2.35.
// http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
#if !GLIB_CHECK_VERSION(2, 35, 0) #if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init(); g_type_init();
#endif #endif
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Required to find the ICU data file, used by some file_util routines. // Required to find the ICU data file, used by some file_util routines.
base::i18n::InitializeICU(); base::i18n::InitializeICU();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment