ash: Cleanup ash_strings target.

While I'm here make it more consistent with the other foo_strings.gyp we have
in the tree.

Some changes:
1) Make it use grit_target.gypi
2) Have a consistent and path oriented grit_out_dir.
3) Prefix the action name with generate_
4) Remove direct_dependent_settings, since that is what grit_target.gypi
is for.

R=jamescook@chromium.org
TBR=thestig@chromium.org # for trivial change in chrome/

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

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

ash/ash_strings.gyp

@@ -3,30 +3,23 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
-  },
-
   'targets': [
     {
       'target_name': 'ash_strings',
       'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/strings',
+      },
       'actions': [
-        # Localizable resources.
         {
-          'action_name': 'ash_strings',
+          'action_name': 'generate_ash_strings',
           'variables': {
             'grit_grd_file': 'ash_strings.grd',
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
-        ],
-      },
+      'includes': [ '../build/grit_target.gypi' ],
     },
   ],
 }

chrome/tools/build/repack_locales.py

@@ -80,8 +80,8 @@ def calc_inputs(locale):
                 'component_strings_%s.pak' % locale))
 
   if USE_ASH:
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_da.pak',
-    inputs.append(os.path.join(SHARE_INT_DIR, 'ash_strings',
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash/strings/ash_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings',
                   'ash_strings_%s.pak' % locale))
 
   if OS != 'ios':