Different build fixups for ozone

Different things which are needed to build chromium-efl with shared
components

- Export CreateOzonePlatformEfl
- Add different gyp dependencies
- make media depend on ozone_efl even if tizen_multimedia_support is
  not set

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=13303
Reviewed by: Antonio Gomes, SeungSeop Park

Change-Id: I08857a428329ae60ede8dfcd90c1ae9280ae8a40
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/chromium_impl/chromium_impl.gypi b/tizen_src/chromium_impl/chromium_impl.gypi
index 7e33cb0..0283139 100644 (file)
--- a/tizen_src/chromium_impl/chromium_impl.gypi
+++ b/tizen_src/chromium_impl/chromium_impl.gypi
@@ -8,23 +8,16 @@
     'content/content_efl.gypi',
     'device/vibration_efl.gypi',
     'gpu/gpu_efl.gypi',
+    'media/media_efl.gypi',
     'ui/ui_efl.gypi',
     'third_party/WebKit/Source/core/core_efl.gypi',
   ],
 
   'conditions': [
-
-    ['tizen_multimedia_support==1', {
-      'includes': [
-        'media/media_efl.gypi',
-      ],
-    }], # tizen_mumtimedia_support==1
-
     ['building_for_tizen_mobile==1', {
       'includes': [
         'device/battery_tizen.gypi',
       ],
     }], # building_for_tizen_mobile==1
-
   ], # conditions
 }

diff --git a/tizen_src/chromium_impl/media/media_efl.gypi b/tizen_src/chromium_impl/media/media_efl.gypi
index 8818e7c..306b5a8 100644 (file)
--- a/tizen_src/chromium_impl/media/media_efl.gypi
+++ b/tizen_src/chromium_impl/media/media_efl.gypi
@@ -3,112 +3,128 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'external_media_deps': [
-      '<(DEPTH)/tizen_src/build/system.gyp:ecore',
-      '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
-      '<(DEPTH)/tizen_src/build/system.gyp:capi-media-camera',
-    ],
-    'conditions': [
-      ['use_wayland==0', {
+  'conditions': [
+
+    ['use_ozone==1', {
+      'variables': {
         'external_media_deps': [
-          '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
+          '<(DEPTH)/tizen_src/chromium_impl/ui/ozone/ozone_efl.gyp:ozone_efl',
         ],
       },
-      {
-        'external_media_deps': [
-          '<(DEPTH)/tizen_src/build/system.gyp:ecore-wayland',
-        ],
-      }],
-      ['building_for_tizen_mobile==1', {
-        'external_media_deps': [
-          '<(DEPTH)/tizen_src/build/system.gyp:capi-system-device',
-        ],
-      }],
-      ['tizen_multimedia_use_capi_for_me==1', {
-        'external_media_deps': [
-          '<(DEPTH)/tizen_src/build/system.gyp:capi-media-player',
-          '<(DEPTH)/tizen_src/build/system.gyp:capi-media-tool',
-          '<(DEPTH)/ui/gl/gl.gyp:gl',
-        ],
-      }],
-    ],
-  },
+    }],
 
-  'target_defaults': {
-    'target_conditions': [
-
-      ['_target_name=="media"', {
-         'include_dirs': [
-           '<(DEPTH)/third_party/WebKit',
-           '<(DEPTH)/third_party/libyuv/include',
-           '<(DEPTH)/third_party/mojo/src',
-           '<(DEPTH)/v8/include',
-         ],
-         'sources': [
-           'base/efl/webaudio_media_codec_info_efl.h',
-           'base/efl/demuxer_stream_player_params_efl.cc',
-           'base/efl/demuxer_stream_player_params_efl.h',
-           'base/efl/demuxer_efl.h',
-           'base/efl/media_player_efl.h',
-           'base/efl/media_player_bridge_gstreamer.cc',
-           'base/efl/media_player_bridge_gstreamer.h',
-           'base/efl/media_player_manager_efl.h',
-           'base/efl/media_player_util_efl.cc',
-           'base/efl/media_player_util_efl.h',
-           'base/efl/media_source_player_gstreamer.cc',
-           'base/efl/media_source_player_gstreamer.h',
-           'base/efl/webmediaplayer_efl.cc',
-           'base/efl/webmediaplayer_efl.h', # ME and MSE
-         ],
+    ['tizen_multimedia_support==1', {
 
+      'variables': {
+        'external_media_deps': [
+          '<(DEPTH)/tizen_src/build/system.gyp:ecore',
+          '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
+          '<(DEPTH)/tizen_src/build/system.gyp:capi-media-camera',
+        ],
         'conditions': [
-
-          ['building_for_tizen==1', {
-            'defines': [
-             'TIZEN_VIDEO_CAPTURE_SUPPORT=1',
-            ],
-            'sources/': [
-              [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.cc$' ],
-              [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.h$' ],
-              [ 'exclude', 'video/capture/linux/video_capture_device_linux.h$' ],
-              [ 'exclude', 'video/capture/linux/video_capture_device_linux.cc$' ],
+          ['use_wayland==0', {
+            'external_media_deps': [
+              '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
             ],
-            'sources': [
-              'video/capture/tizen/video_capture_device_tizen.cc',
-              'video/capture/tizen/video_capture_device_tizen.h',
-              'video/capture/tizen/video_capture_device_factory_tizen.cc',
-              'video/capture/tizen/video_capture_device_factory_tizen.h',
+          },
+          {
+            'external_media_deps': [
+              '<(DEPTH)/tizen_src/build/system.gyp:ecore-wayland',
             ],
           }],
-
-          ['building_for_tizen_tv==1 and chromium_efl_tizen_version!="3.0"', {
-            'sources': [
-              'audio/tizen/audio_session_manager.h',
-              'audio/tizen/audio_session_manager.cc', # ASM
-            ],
-          }],
-          ['tizen_multimedia_eme_support==1', {
-            'defines': [
-              'TIZEN_MULTIMEDIA_EME_SUPPORT=1',
+          ['building_for_tizen_mobile==1', {
+            'external_media_deps': [
+              '<(DEPTH)/tizen_src/build/system.gyp:capi-system-device',
             ],
           }],
           ['tizen_multimedia_use_capi_for_me==1', {
-            'sources': [
-              'base/tizen/media_player_bridge_capi.cc',
-              'base/tizen/media_player_bridge_capi.h', # ME with CAPI-MEDIA-PLAYER
-            ],
-            # Exclude the sources that depend on CAPI-MEDIA-PLAYER
-            'sources!': [
-              'base/efl/media_player_bridge_gstreamer.cc',
-              'base/efl/media_player_bridge_gstreamer.h', # ME with Gstreamer
+            'external_media_deps': [
+              '<(DEPTH)/tizen_src/build/system.gyp:capi-media-player',
+              '<(DEPTH)/tizen_src/build/system.gyp:capi-media-tool',
+              '<(DEPTH)/ui/gl/gl.gyp:gl',
             ],
           }],
+        ],
+      },
+
+      'target_defaults': {
+        'target_conditions': [
+
+          ['_target_name=="media"', {
+             'include_dirs': [
+               '<(DEPTH)/third_party/WebKit',
+               '<(DEPTH)/third_party/libyuv/include',
+               '<(DEPTH)/third_party/mojo/src',
+               '<(DEPTH)/v8/include',
+             ],
+             'sources': [
+               'base/efl/webaudio_media_codec_info_efl.h',
+               'base/efl/demuxer_stream_player_params_efl.cc',
+               'base/efl/demuxer_stream_player_params_efl.h',
+               'base/efl/demuxer_efl.h',
+               'base/efl/media_player_efl.h',
+               'base/efl/media_player_bridge_gstreamer.cc',
+               'base/efl/media_player_bridge_gstreamer.h',
+               'base/efl/media_player_manager_efl.h',
+               'base/efl/media_player_util_efl.cc',
+               'base/efl/media_player_util_efl.h',
+               'base/efl/media_source_player_gstreamer.cc',
+               'base/efl/media_source_player_gstreamer.h',
+               'base/efl/webmediaplayer_efl.cc',
+               'base/efl/webmediaplayer_efl.h', # ME and MSE
+             ],
+
+            'conditions': [
+
+              ['building_for_tizen==1', {
+                'defines': [
+                 'TIZEN_VIDEO_CAPTURE_SUPPORT=1',
+                ],
+                'sources/': [
+                  [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.cc$' ],
+                  [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.h$' ],
+                  [ 'exclude', 'video/capture/linux/video_capture_device_linux.h$' ],
+                  [ 'exclude', 'video/capture/linux/video_capture_device_linux.cc$' ],
+                ],
+                'sources': [
+                  'video/capture/tizen/video_capture_device_tizen.cc',
+                  'video/capture/tizen/video_capture_device_tizen.h',
+                  'video/capture/tizen/video_capture_device_factory_tizen.cc',
+                  'video/capture/tizen/video_capture_device_factory_tizen.h',
+                ],
+              }],
+
+              ['building_for_tizen_tv==1 and chromium_efl_tizen_version!="3.0"', {
+                'sources': [
+                  'audio/tizen/audio_session_manager.h',
+                  'audio/tizen/audio_session_manager.cc', # ASM
+                ],
+              }],
+              ['tizen_multimedia_eme_support==1', {
+                'defines': [
+                  'TIZEN_MULTIMEDIA_EME_SUPPORT=1',
+                ],
+              }],
+              ['tizen_multimedia_use_capi_for_me==1', {
+                'sources': [
+                  'base/tizen/media_player_bridge_capi.cc',
+                  'base/tizen/media_player_bridge_capi.h', # ME with CAPI-MEDIA-PLAYER
+                ],
+                # Exclude the sources that depend on CAPI-MEDIA-PLAYER
+                'sources!': [
+                  'base/efl/media_player_bridge_gstreamer.cc',
+                  'base/efl/media_player_bridge_gstreamer.h', # ME with Gstreamer
+                ],
+              }],
 
         ], # conditions
 
       }], # _target_name=="media"
 
-    ], # target_conditions
-  }, # target_defaults
+      ], # target_conditions
+    }, # target_defaults
+
+    }], # tizen_multimedia_support==1
+  ]
+
 }

diff --git a/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.h b/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.h
index ea03d08..65949a7 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.h
+++ b/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.h
@@ -38,6 +38,8 @@ class OzonePlatformEfl : public OzonePlatform {
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformEfl);
 };
 
+OzonePlatform* CreateOzonePlatformEfl();
+
 }  // namespace ui
 
 #endif // OZONE_OZONE_PLATFORM_EFL_H_

diff --git a/tizen_src/chromium_impl/ui/ui_efl.gypi b/tizen_src/chromium_impl/ui/ui_efl.gypi
index eb50d99..bedf88d 100644 (file)
--- a/tizen_src/chromium_impl/ui/ui_efl.gypi
+++ b/tizen_src/chromium_impl/ui/ui_efl.gypi
@@ -16,6 +16,10 @@
     ],
     'conditions': [
       ['use_wayland==0', {
+        'external_ui_base_deps': [
+          '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
+          '<(DEPTH)/tizen_src/build/system.gyp:x11',
+        ],
         'external_ui_gl_deps': [
           '<(DEPTH)/tizen_src/build/system.gyp:libdri2',
         ],
@@ -42,6 +46,7 @@
       'variables': {
         'external_ozone_platform_deps': [
           '<(DEPTH)/tizen_src/chromium_impl/ui/ozone/ozone_efl.gyp:ozone_efl',
+          '<(DEPTH)/ui/events/devices/events_devices.gyp:events_devices',
         ],
       },
     }], # use_ozone==1