Move Android's build_output_dirs target to its own file.

We shouldn't have logic in all_android.gyp. The purpose of that file is
solely to have a list of dependencies which should be build when creating
a gyp file for Android.

BUG=
TEST=gyp generation works.

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

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

3 files changed, 38 insertions, 31 deletions

diff --git a/build/all_android.gyp b/build/all_android.gyp
index 26df563..2a26349 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -119,35 +119,5 @@
         '../content/content.gyp:content_browsertests',
       ],
     },
-    {
-      # Target for creating common output build directories. Creating output
-      # dirs beforehand ensures that build scripts can assume these folders to
-      # exist and there are no race conditions resulting from build scripts
-      # trying to create these directories.
-      # The build/java.gypi target depends on this target.
-      'target_name': 'build_output_dirs',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'create_java_output_dirs',
-          'variables' : {
-          'output_dirs' : [
-            '<(PRODUCT_DIR)/apks',
-            '<(PRODUCT_DIR)/lib.java',
-            '<(PRODUCT_DIR)/test.lib.java',
-           ]
-          },
-          'inputs' : [],
-          'outputs': [
-            '<@(output_dirs)'
-          ],
-          'action': [
-            'mkdir',
-            '-p',
-            '<@(output_dirs)',
-          ],
-        },
-      ],
-    }, # build_output_dirs
   ],  # targets
 }
diff --git a/build/build_output_dirs_android.gyp b/build/build_output_dirs_android.gyp
new file mode 100644
index 0000000..2b5845b
--- /dev/null
+++ b/build/build_output_dirs_android.gyp
@@ -0,0 +1,37 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'targets': [
+    {
+      # Target for creating common output build directories. Creating output
+      # dirs beforehand ensures that build scripts can assume these folders to
+      # exist and there are no race conditions resulting from build scripts
+      # trying to create these directories.
+      # The build/java.gypi target depends on this target.
+      'target_name': 'build_output_dirs',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'create_java_output_dirs',
+          'variables' : {
+          'output_dirs' : [
+            '<(PRODUCT_DIR)/apks',
+            '<(PRODUCT_DIR)/lib.java',
+            '<(PRODUCT_DIR)/test.lib.java',
+           ]
+          },
+          'inputs' : [],
+          'outputs': [
+            '<@(output_dirs)'
+          ],
+          'action': [
+            'mkdir',
+            '-p',
+            '<@(output_dirs)',
+          ],
+        },
+      ],
+    }, # build_output_dirs
+  ], # targets
+}
diff --git a/build/java.gypi b/build/java.gypi
index a955917..ccc4f8c 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -29,7 +29,7 @@
 
 {
   'dependencies': [
-    '<(DEPTH)/build/all_android.gyp:build_output_dirs'
+    '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
   ],
   'direct_dependent_settings': {
     'variables': {