[Tizen] Remove dependency of elocation

It's only needed for desktop build.

Change-Id: Ia9396819cb92575c6c9d714ce7998e515fc7fdd7
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/efl/build/system.gyp b/efl/build/system.gyp
index 2461986..35d3ec6 100644 (file)
--- a/efl/build/system.gyp
+++ b/efl/build/system.gyp
@@ -31,19 +31,23 @@
     {
       'target_name': 'elocation',
       'type': 'none',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags elocation)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other elocation)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l elocation)',
-        ],
-      },
+      'conditions': [
+        ['desktop_linux==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags elocation)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other elocation)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l elocation)',
+            ],
+          },
+        }],
+      ],
     }, # elocation
     {
       'target_name': 'elementary',

diff --git a/electron.gyp b/electron.gyp
index c3bdebc..9829911 100644 (file)
--- a/electron.gyp
+++ b/electron.gyp
@@ -366,7 +366,6 @@
           'conditions': [
             ['is_tizen==1', {
               'dependencies': [
-                '<(DEPTH)/efl/build/system.gyp:elocation',
                 '<(DEPTH)/efl/build/system.gyp:elementary',
                 '<(DEPTH)/efl/build/system.gyp:evas',
                 '<(DEPTH)/efl/build/system.gyp:icu',

diff --git a/packaging/electron-efl.spec b/packaging/electron-efl.spec
index 0900e75..ac901f9 100755 (executable)
--- a/packaging/electron-efl.spec
+++ b/packaging/electron-efl.spec
@@ -20,7 +20,6 @@ BuildRequires: pkgconfig(chromium-efl) >= 56.0.0, pkgconfig(chromium-efl) < 57.0
 BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: pkgconfig(ecore-evas)
 BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(elocation)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(expat)
 BuildRequires: pkgconfig(gmodule-2.0)