Added macro support OS(TIZEN), OS(TIZEN_MOBILE) and OS(TIZEN_TV) for WebKit.

1) This patch allows to replace statement #if defined(OS_TIZEN_MOBILE) with
statement #if OS(TIZEN_MOBILE). Usage of OS macro is required because
buildbot has presubmit check which dissalow to commit patch which contains
macro which matches to pattern OS_*.
2) Added dependency to library capi-system-system-settings.
Library 'capi-system-system-settings' is used by WebKit project for Tizen build
(WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp). Currently OS(TIZEN) macro
was not working and after fixing macro issue project won't compile, so we
need to fix also dependency.
Reviewed by: Antonio Gomes, Piotr Szawdyński, SeungSeop Park, Tomasz Czekala

Change-Id: I36694bce7090a02e53982c3d936dc4a997377470
Signed-off-by: Piotr Szawdyński <p.szawdynski@samsung.com>
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 16e5e3e..40a8c7c 100644 (file)
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -301,6 +301,27 @@
       ],
     }, # capi-system-sensor
     {
+      'target_name': 'capi-system-system-settings',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-system-system-settings)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-system-system-settings)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-system-system-settings)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-system-system-settings
+    {
       'target_name': 'libdri2',
       'type': 'none',
       'conditions': [

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index a7622a9..37a7df7 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -7,6 +7,7 @@
     'external_content_common_deps': [
       '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
       '<(DEPTH)/tizen_src/build/system.gyp:capi-appfw-application',
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-system-system-settings',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
       '<(DEPTH)/tizen_src/build/system.gyp:tts',
     ],

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index ca2ba01..f6a2086 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -87,6 +87,7 @@ BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(capi-system-device)
+BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires: pkgconfig(location)
 BuildRequires: pkgconfig(gles20)

diff --git a/tizen_src/supplement.gypi b/tizen_src/supplement.gypi
index ec7ff03..9436a8d 100644 (file)
--- a/tizen_src/supplement.gypi
+++ b/tizen_src/supplement.gypi
@@ -106,6 +106,7 @@
       ['building_for_tizen==1', {
         'defines': [
           'OS_TIZEN=1',
+          'WTF_OS_TIZEN=1',
           # For GCC 4.5.3 bundled arm.h has a bug and don't define __ARM_PCS when it should.
           # Force define this flag for the whole chromium on gbs gcc 4.5.3.
           # Non-arm builds will ingore it in any case.
@@ -138,6 +139,7 @@
       ['building_for_tizen_mobile==1', {
         'defines': [
           'OS_TIZEN_MOBILE=1',
+          'WTF_OS_TIZEN_MOBILE=1',
           'TIZEN_CONTENTS_DETECTION=1',
           'TIZEN_ENABLE_CAPI_SUPPORT=1',
         ],
@@ -146,6 +148,7 @@
       ['building_for_tizen_tv==1', {
        'defines': [
          'OS_TIZEN_TV=1',
+         'WTF_OS_TIZEN_TV=1',
        ],
        'conditions': [
          ['chromium_efl_tizen_version=="2.2.1"', {