Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome_resources.gyp

diff --git a/src/chrome/chrome_resources.gyp b/src/chrome/chrome_resources.gyp
index ee78cbf..52aabc9 100644 (file)
--- a/src/chrome/chrome_resources.gyp
+++ b/src/chrome/chrome_resources.gyp
@@ -99,6 +99,24 @@
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
+          ],
+          'copies': [
+            {
+              # GN version: //chrome/browser/resources:extension_resource_demo
+              'destination': '<(PRODUCT_DIR)/resources/extension/demo',
+              'files': [
+                'browser/resources/extension_resource/demo/library.js',
+              ],
+            },
+          ],
+        }],
+        ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox',
+          ],
+        }],
+        ['enable_extensions==1', {
+          'actions': [
             {
               # GN version: //chrome/browser/resources:quota_internals_resources
               'action_name': 'generate_quota_internals_resources',
@@ -116,29 +134,6 @@
               'includes': [ '../build/grit_action.gypi' ],
             },
           ],
-          'copies': [
-            {
-              # GN version: //chrome/browser/resources:extension_resource_demo
-              'destination': '<(PRODUCT_DIR)/resources/extension/demo',
-              'files': [
-                'browser/resources/extension_resource/demo/library.js',
-              ],
-            },
-          ],
-        }],
-        ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
-          'conditions': [
-            # TODO(dtseng): Remove use_chromevox_next once ChromeVox Next is ready for testing.
-            ['use_chromevox_next==1', {
-              'dependencies': [
-                'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2',
-              ],
-            }, { # else use_chromevox_next == 0
-              'dependencies': [
-                'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox',
-              ],
-            }],
-          ],
         }],
       ],
     },
@@ -279,7 +274,6 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome/app:make_generated_resources_map
@@ -375,6 +369,7 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
+      # GN version: //chrome:packed_extra_resources
       'target_name': 'packed_extra_resources',
       'type': 'none',
       'dependencies': [
@@ -402,6 +397,7 @@
       ],
     },
     {
+      # GN version: //chrome:packed_resources
       'target_name': 'packed_resources',
       'type': 'none',
       'dependencies': [
@@ -418,6 +414,7 @@
       ],
       'actions': [
         {
+          # GN version: //chrome:repack_locales_pack
           'action_name': 'repack_locales_pack',
           'variables': {
             'pak_locales': '<(locales)',
@@ -425,6 +422,7 @@
           'includes': ['chrome_repack_locales.gypi']
         },
         {
+          # GN version: //chrome:repack_pseudo_locales_pack
           'action_name': 'repack_pseudo_locales_pack',
           'variables': {
             'pak_locales': '<(pseudo_locales)',
@@ -441,10 +439,9 @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
+            '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
             '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
-            '<(DEPTH)/content/content_resources.gyp:content_resources',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
-            '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
         }],
         ['use_ash==1', {
@@ -459,6 +456,12 @@
             '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
           ],
         }],
+        ['use_athena==1', {
+          'dependencies': [
+            '<(DEPTH)/athena/resources/athena_resources.gyp:athena_resources',
+            '<(DEPTH)/athena/strings/athena_strings.gyp:athena_strings',
+          ],
+        }],
         ['enable_autofill_dialog==1 and OS!="android"', {
           'dependencies': [
             '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',