Fix gyp failure on linux when use_ozone=1 is set

build/gn_migration.gypi

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file defines five targets that we are using to track the progress of the
 # GYP->GN migration:
 #
 # 'both_gn_and_gyp' lists what GN is currently capable of building and should
 # match the 'both_gn_and_gyp' target in //BUILD.gn.
 #
@@ skipping 222 matching lines @@
         ['enable_mdns==1', {
           'dependencies': [
             '../chrome/chrome.gyp:service_discovery_sniffer',
           ]
         }],
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting_all.gyp:remoting_all',
           ],
         }],
-        ['remoting==1 and chromeos==0', {
+        ['remoting==1 and chromeos==0 and use_x11==1', {

[Dirk Pranke, 2015/05/18 20:44:16]

This seems to be the right change to at least match what we do in
remoting/remoting_enable.gypi, but this doesn't actually solve the bug (which is
a gyp bug), right?

[babu, 2015/05/19 11:10:53]

Thanks for reviewing, Dirk!

This fixes the build error for me. My understanding is that the
gn_migration.gypi is adding remoting_me2me_* targets, but those targets are not
enabled in remoting/remoting_host.gypi when use_x11=0 and that is causing build
failure in the Linux builds. I might be wrong here though.

This patch fixes the issue by not trying to include those targets in
gn_migration.gypi when use_x11=0.

[Dirk Pranke, 2015/05/19 19:54:47]

Oh, I'm sorry, I totally misread this and thought you were modifying a GN file
:(.

lgtm.

           'dependencies': [
             '../remoting/remoting.gyp:remoting_me2me_host',
             '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list_demo',
             '../ui/views/views.gyp:views_unittests',
           ],
@@ skipping 419 matching lines @@
           'dependencies': [
             # TODO(GYP): All of these targets need to be ported over.
             '../components/components.gyp:policy_win64',
           ]
         }],
       ],
     },
   ]
 }