Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / common / xwalk_application_common.gypi

diff --git a/src/xwalk/application/common/xwalk_application_common.gypi b/src/xwalk/application/common/xwalk_application_common.gypi
index cb7eca1..e9a91ea 100644 (file)
--- a/src/xwalk/application/common/xwalk_application_common.gypi
+++ b/src/xwalk/application/common/xwalk_application_common.gypi
@@ -12,12 +12,10 @@
         '../../../sql/sql.gyp:sql',
         '../../../url/url.gyp:url_lib',
         '../../../third_party/libxml/libxml.gyp:libxml',
+        '../../../third_party/re2/re2.gyp:re2',
         '../../../third_party/zlib/google/zip.gyp:zip',
       ],
       'sources': [
-        'application_storage.cc',
-        'application_storage.h',
-
         'application_data.cc',
         'application_data.h',
         'application_file_util.cc',
@@ -26,13 +24,10 @@
         'application_manifest_constants.h',
         'application_resource.cc',
         'application_resource.h',
-        'application_storage_constants.cc',
-        'application_storage_constants.h',
         'constants.cc',
         'constants.h',
         'id_util.cc',
         'id_util.h',
-        'install_warning.h',
         'manifest.cc',
         'manifest.h',
         'manifest_handler.cc',
@@ -49,18 +44,12 @@
         'permission_policy_manager.h',
         'permission_types.h',
         'signature_types.h',
-
-        'installer/package.h',
-        'installer/package.cc',
-        'installer/package_installer.cc',
-        'installer/package_installer.h',
-        'installer/signature_data.h',
-        'installer/signature_parser.h',
-        'installer/signature_parser.cc',
-        'installer/wgt_package.h',
-        'installer/wgt_package.cc',
-        'installer/xpk_package.cc',
-        'installer/xpk_package.h',
+        'package/package.h',
+        'package/package.cc',
+        'package/wgt_package.h',
+        'package/wgt_package.cc',
+        'package/xpk_package.cc',
+        'package/xpk_package.h',
       ],
       'conditions': [
         ['tizen==1', {
@@ -68,10 +57,17 @@
             '../../build/system.gyp:tizen',
             '../../tizen/xwalk_tizen.gypi:xwalk_tizen_lib',
             '../../../third_party/re2/re2.gyp:re2',
+            '../../../net/net.gyp:net',
           ],
+          'cflags': [
+            '<!@(pkg-config --cflags xmlsec1)',
+          ],
+          'link_settings': {
+            'libraries': [
+              '<!@(pkg-config --libs-only-l xmlsec1)',
+            ],
+          },
           'sources': [
-            'application_storage_impl_tizen.cc',
-            'application_storage_impl_tizen.h',
             'manifest_handlers/navigation_handler.cc',
             'manifest_handlers/navigation_handler.h',
             'manifest_handlers/tizen_application_handler.cc',
@@ -82,16 +78,25 @@
             'manifest_handlers/tizen_setting_handler.h',
             'manifest_handlers/tizen_splash_screen_handler.cc',
             'manifest_handlers/tizen_splash_screen_handler.h',
-            'installer/package_installer_tizen.cc',
-            'installer/package_installer_tizen.h',
-            'installer/tizen/packageinfo_constants.cc',
-            'installer/tizen/packageinfo_constants.h',
+            'tizen/application_storage.cc',
+            'tizen/application_storage.h',
+            'tizen/application_storage_impl.cc',
+            'tizen/application_storage_impl.h',
+            'tizen/cookie_manager.cc',
+            'tizen/cookie_manager.h',
+            'tizen/encryption.cc',
+            'tizen/encryption.h',
+            'tizen/package_query.cc',
+            'tizen/package_query.h',
+            'tizen/signature_data.h',
+            'tizen/signature_data.cc',
+            'tizen/signature_parser.h',
+            'tizen/signature_parser.cc',
+            'tizen/signature_validator.cc',
+            'tizen/signature_validator.h',
+            'tizen/signature_xmlsec_adaptor.cc',
+            'tizen/signature_xmlsec_adaptor.h',
           ],
-        }, {
-        'sources': [
-            'application_storage_impl.cc',
-            'application_storage_impl.h',
-          ]
         }],
       ],
       'include_dirs': [