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: http://src.chromium.org/svn/trunk/src/build@157963 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
peter@chromium.org 2012-09-21 11:11:10 +00:00
Родитель c7953f6593
Коммит b1744c8c01
3 изменённых файлов: 38 добавлений и 31 удалений

Просмотреть файл

@ -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
}

Просмотреть файл

@ -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
}

Просмотреть файл

@ -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': {