Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / content / content_common.gypi

diff --git a/src/content/content_common.gypi b/src/content/content_common.gypi
index 16ccdf2..8f62eb8 100644 (file)
--- a/src/content/content_common.gypi
+++ b/src/content/content_common.gypi
@@ -504,15 +504,6 @@
         'content.gyp:webkit_version',
       ],
     }],
-    # Work around for bug in linker used on ia32 and mipsel machines (gold is
-    # not used on ia32 and mipsel machines). See bug 353273.
-    ['use_mojo==1 and OS=="linux" and (target_arch=="ia32" or target_arch=="mipsel") and component=="static_library"', {
-      'link_settings': {
-        'libraries': [
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
-        ],
-      },
-    }],
     ['use_mojo==0', {
       'sources!': [
         'common/mojo/mojo_channel_init.cc',
@@ -612,6 +603,7 @@
     ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
       'dependencies': [
         '../media/media.gyp:media',
+        '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
       ],
       'sources': [
         'common/gpu/media/exynos_v4l2_video_device.cc',
@@ -633,22 +625,47 @@
         ],
       },
     }],
-    ['target_arch != "arm" and use_x11 == 1', {
+    ['target_arch != "arm" and (use_x11 == 1 or use_ozone == 1)', {
+      'dependencies': [
+        '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
+      ],
       'sources': [
         'common/gpu/media/h264_dpb.cc',
         'common/gpu/media/h264_dpb.h',
         'common/gpu/media/va_surface.h',
         'common/gpu/media/vaapi_h264_decoder.cc',
         'common/gpu/media/vaapi_h264_decoder.h',
-        'common/gpu/media/vaapi_video_decode_accelerator.cc',
         'common/gpu/media/vaapi_video_decode_accelerator.h',
         'common/gpu/media/vaapi_wrapper.cc',
         'common/gpu/media/vaapi_wrapper.h',
       ],
+      'conditions': [
+        [ 'use_x11 == 1', {
+          'variables': {
+            'extra_header': 'common/gpu/media/va_stub_header.fragment',
+            'sig_files': ['common/gpu/media/va.sigs'],
+          },
+          'sources': [
+            'common/gpu/media/vaapi_video_decode_accelerator.cc',
+          ]
+        }],
+        [ 'use_ozone == 1', {
+          'variables': {
+            'extra_header': 'common/gpu/media/va_wayland_stub_header.fragment',
+            'sig_files': ['common/gpu/media/va_wayland.sigs'],
+          },
+          'link_settings': {
+            'libraries': [
+              '-lwayland-client',
+            ],
+          },
+          'sources': [
+            'common/gpu/media/vaapi_video_decode_accelerator_wayland.cc',
+          ]
+        }],
+      ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-        'extra_header': 'common/gpu/media/va_stub_header.fragment',
-        'sig_files': ['common/gpu/media/va.sigs'],
         'outfile_type': 'posix_stubs',
         'stubs_filename_root': 'va_stubs',
         'project_path': 'content/common/gpu/media',