← Back to branch summary

~abreu-alexandre/oxide/v8-deprecations

« back to all changes in this revision

Viewing changes to shared/shared.gyp

  • Committer: Chris Coulson
  • Date: 2016-02-22 08:32:35 UTC
  • mfrom: (640.1.472 crmaster)
  • Revision ID: chris.coulson@canonical.com-20160222083235-5gxj6a81zqvpz52g
Merge r1112 from lp:oxide/crmaster

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/shared.gyp
202
202
        ],
203
203
      },
204
204
      'export_dependent_settings': [
205
 
        '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
 
205
        '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
206
206
        '<(DEPTH)/third_party/re2/re2.gyp:re2',
207
207
        '<(DEPTH)/ui/accessibility/accessibility.gyp:accessibility',
208
208
      ],
246
246
        '<(DEPTH)/media/media.gyp:media',
247
247
        '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
248
248
        '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
 
249
        '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
 
250
        '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
249
251
        '<(DEPTH)/net/net.gyp:net',
250
252
        '<(DEPTH)/skia/skia.gyp:skia',
251
253
        '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers',
252
254
        '<(DEPTH)/third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
253
 
        '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
254
 
        '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
255
255
        '<(DEPTH)/third_party/re2/re2.gyp:re2',
256
256
        '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
257
257
        # Not used directly. Should content_browser have this in export_dependent_settings?