Upstream version 8.36.161.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / tools / linux / xwalk_application_tools.gyp

diff --git a/src/xwalk/application/tools/linux/xwalk_application_tools.gyp b/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
index f3b06af..97ca4b4 100644 (file)
--- a/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
+++ b/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
@@ -31,12 +31,18 @@
         '../../../..',
       ],
       'sources': [
-        'dbus_connection.h',
         'dbus_connection.cc',
-        'xwalk_tizen_user.h',
-        'xwalk_tizen_user.cc',
+        'dbus_connection.h',
         'xwalkctl_main.cc',
       ],
+      'conditions' : [
+        ['tizen==1', {
+          'sources': [
+            'xwalk_tizen_user.cc',
+            'xwalk_tizen_user.h',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'xwalk_launcher',
@@ -46,15 +52,14 @@
         '../../../..',
       ],
       'dependencies': [
+        '../../../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../../extensions/extensions.gyp:xwalk_extensions',
       ],
       'sources': [
-        'dbus_connection.h',
         'dbus_connection.cc',
-        'xwalk_extension_process_launcher.h',
+        'dbus_connection.h',
         'xwalk_extension_process_launcher.cc',
-        'xwalk_tizen_user.h',
-        'xwalk_tizen_user.cc',
+        'xwalk_extension_process_launcher.h',
         'xwalk_launcher_main.cc',
       ],
       'conditions' : [
@@ -63,14 +68,17 @@
             'gio',
           ],
         }],
-        ['tizen==1 or tizen_mobile==1', {
+        ['tizen==1', {
           'dependencies': [
             'gio',
+            '../../../build/system.gyp:tizen',
             '../../../build/system.gyp:tizen_appcore_common'
           ],
           'sources': [
             'xwalk_launcher_tizen.cc',
             'xwalk_launcher_tizen.h',
+            'xwalk_tizen_user.cc',
+            'xwalk_tizen_user.h',
           ],
         }],
       ],