Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / content.gyp

diff --git a/src/content/content.gyp b/src/content/content.gyp
index fbd3b7d..f380cab 100644 (file)
--- a/src/content/content.gyp
+++ b/src/content/content.gyp
@@ -40,12 +40,16 @@
       ],
       'targets': [
         {
+          # GN version: //content
           'target_name': 'content',
           'type': 'none',
           'dependencies': [
             'content_browser',
             'content_common',
           ],
+          'export_dependent_settings': [
+            'content_common',
+          ],
           'conditions': [
             ['OS != "ios"', {
               'dependencies': [
@@ -55,12 +59,12 @@
                 'content_ppapi_plugin',
                 'content_renderer',
                 'content_utility',
-                'content_worker',
               ],
             }],
           ],
         },
         {
+          # GN version: //content/app:browser
           'target_name': 'content_app_browser',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -70,6 +74,9 @@
           'dependencies': [
             'content_common',
           ],
+          'export_dependent_settings': [
+            'content_common',
+          ],
           'conditions': [
             ['chrome_multiple_dll', {
               'defines': [
@@ -79,6 +86,7 @@
           ],
         },
         {
+          # GN version: //content/app:child
           'target_name': 'content_app_child',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -88,6 +96,9 @@
           'dependencies': [
             'content_common',
           ],
+          'export_dependent_settings': [
+            'content_common',
+          ],
           'conditions': [
             ['chrome_multiple_dll', {
               'defines': [
@@ -97,6 +108,7 @@
           ],
         },
         {
+          # GN version: //content/app:both
           'target_name': 'content_app_both',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -111,6 +123,7 @@
           ],
         },
         {
+          # GN version: //content/browser and //content/public/browser
           'target_name': 'content_browser',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -121,6 +134,9 @@
             'content_common',
             'content_resources.gyp:content_resources',
           ],
+          'export_dependent_settings': [
+            'content_common',
+          ],
           'conditions': [
             ['java_bridge==1', {
               'dependencies': [
@@ -136,6 +152,7 @@
           ],
         },
         {
+          # GN version: //content/common and //content/public/common
           'target_name': 'content_common',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -157,6 +174,7 @@
         ['OS != "ios"', {
           'targets': [
             {
+              # GN version: //content/child and //content/public/child
               'target_name': 'content_child',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -170,6 +188,7 @@
               'msvs_disabled_warnings': [ 4267, ],
             },
             {
+              # GN version: //content/gpu
               'target_name': 'content_gpu',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -182,6 +201,7 @@
               ],
             },
             {
+              # GN version: //content/plugin and //content/public/plugin
               'target_name': 'content_plugin',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -194,6 +214,7 @@
               ],
             },
             {
+              # GN version: //content/ppapi_plugin
               'target_name': 'content_ppapi_plugin',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -204,6 +225,7 @@
               'msvs_disabled_warnings': [ 4267, ],
             },
             {
+              # GN version: //content/renderer and //content/public/renderer
               'target_name': 'content_renderer',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -224,6 +246,7 @@
               ],
             },
             {
+              # GN version: //content/utility and //content/public/utility
               'target_name': 'content_utility',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -235,18 +258,6 @@
                 'content_common',
               ],
             },
-            {
-              'target_name': 'content_worker',
-              'type': 'static_library',
-              'variables': { 'enable_wexit_time_destructors': 1, },
-              'includes': [
-                'content_worker.gypi',
-              ],
-              'dependencies': [
-                'content_child',
-                'content_common',
-              ],
-            },
           ],
         }],
       ],
@@ -254,6 +265,7 @@
     {  # component != static_library
       'targets': [
         {
+          # GN version: //content
           'target_name': 'content',
           'type': 'shared_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -277,7 +289,6 @@
             'content_ppapi_plugin.gypi',
             'content_renderer.gypi',
             'content_utility.gypi',
-            'content_worker.gypi',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
@@ -290,28 +301,33 @@
           },
         },
         {
+          # GN version: //content/app:browser
           'target_name': 'content_app_browser',
           'type': 'none',
           'dependencies': ['content', 'content_browser'],
         },
         {
+          # GN version: //content/app:child
           'target_name': 'content_app_child',
           'type': 'none',
           'dependencies': ['content', 'content_child'],
         },
         {
+          # GN version: //content/app:both
           'target_name': 'content_app_both',
           'type': 'none',
           'dependencies': ['content'],
           'export_dependent_settings': ['content'],
         },
         {
+          # GN version: //content/browser and //content/public/browser
           'target_name': 'content_browser',
           'type': 'none',
           'dependencies': ['content'],
           'export_dependent_settings': ['content'],
         },
         {
+          # GN version: //content/common and //content/public/common
           'target_name': 'content_common',
           'type': 'none',
           'dependencies': ['content', 'content_resources.gyp:content_resources'],
@@ -320,21 +336,25 @@
           'export_dependent_settings': ['content'],
         },
         {
+          # GN Version: //content/child
           'target_name': 'content_child',
           'type': 'none',
           'dependencies': ['content'],
         },
         {
+          # GN version: //content/gpu
           'target_name': 'content_gpu',
           'type': 'none',
           'dependencies': ['content'],
         },
         {
+          # GN version: //content/plugin
           'target_name': 'content_plugin',
           'type': 'none',
           'dependencies': ['content'],
         },
         {
+          # GN version: //content/ppapi_plugin
           'target_name': 'content_ppapi_plugin',
           'type': 'none',
           'dependencies': ['content'],
@@ -342,21 +362,18 @@
           'msvs_disabled_warnings': [ 4267, ],
         },
         {
+          # GN version: //content/renderer and //content/public/renderer
           'target_name': 'content_renderer',
           'type': 'none',
           'dependencies': ['content'],
         },
         {
+          # GN version: //content/utility
           'target_name': 'content_utility',
           'type': 'none',
           'dependencies': ['content'],
           'export_dependent_settings': ['content'],
         },
-        {
-          'target_name': 'content_worker',
-          'type': 'none',
-          'dependencies': ['content'],
-        },
       ],
     }],
     ['OS == "android"', {
@@ -390,6 +407,7 @@
             'page_transition_types_java',
             'popup_item_type_java',
             'result_codes_java',
+            'selection_event_type_java',
             'speech_recognition_error_java',
             'top_controls_state_java',
             'screen_orientation_values_java',
@@ -471,6 +489,18 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          'target_name': 'selection_event_type_java',
+          'type': 'none',
+          'sources': [
+            'public/android/java/src/org/chromium/content/browser/input/SelectionEventType.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/content/browser/input',
+            'template_deps': ['browser/renderer_host/input/selection_event_type_list.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
+        {
           'target_name': 'speech_recognition_error_java',
           'type': 'none',
           'sources': [