ui: Cleanup the generated path to ui strings.

This makes things much more clearer and in order with the rest of
strings/grit targets.

BUG=323025
TEST=None
R=tony@chromium.org,lcwu@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/398873004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284024 0039d316-1c4b-4281-b951-d872f2087c98

apps/shell/app_shell.gyp

@@ -54,8 +54,8 @@
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
             ],

chrome/tools/build/repack_locales.py

@@ -105,8 +105,8 @@ def calc_inputs(locale):
     inputs.append(os.path.join(SHARE_INT_DIR, 'device', 'bluetooth', 'strings',
                   'device_bluetooth_strings_%s.pak' % locale))
 
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',
-    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'app_locale_settings',
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
                   'app_locale_settings_%s.pak' % locale))
 
     # For example:

chromecast/chromecast.gyp

@@ -83,12 +83,12 @@
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
             ],

content/content_shell.gypi

@@ -463,9 +463,9 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',

ui/resources/ui_resources.gyp

@@ -52,9 +52,9 @@
           'action_name': 'repack_ui_test_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/ui_test.pak',

ui/strings/ui_strings.gyp

@@ -3,38 +3,30 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'chromium_code': 1,
-    'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui',
-  },
   'targets': [
     {
       'target_name': 'ui_strings',
       'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/strings',
+      },
       'actions': [
         {
-          'action_name': 'ui_strings',
+          'action_name': 'generate_ui_strings',
           'variables': {
             'grit_grd_file': 'ui_strings.grd',
-            'grit_out_dir': '<(grit_base_out_dir)/strings',
           },
           'includes': [ '../../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'app_locale_settings',
+          'action_name': 'generate_app_locale_settings',
           'variables': {
             'grit_grd_file': 'app_locale_settings.grd',
-            'grit_out_dir': '<(grit_base_out_dir)/app_locale_settings',
           },
           'includes': [ '../../build/grit_action.gypi' ],
         },
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(grit_base_out_dir)/app_locale_settings',
-          '<(grit_base_out_dir)/strings',
-        ],
-      },
+      'includes': [ '../../build/grit_target.gypi' ],
     },
   ],
 }