Fix protoc_java.gypi action dependency.

The genproto_java action was not necessarily run before the java.gypi
included action, so the build would fail.

This makes java.gypi depend on the genproto_java stamp file, so the
order will now be deterministic.

BUG=161587

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@168838 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
nyquist@chromium.org 2012-11-20 18:05:34 +00:00
Родитель b4b2f9f175
Коммит 07da02aaf0
1 изменённых файлов: 6 добавлений и 2 удалений

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

@ -42,11 +42,15 @@
'java_out_dir': '<(PRODUCT_DIR)/java_proto/<(_target_name)/src', 'java_out_dir': '<(PRODUCT_DIR)/java_proto/<(_target_name)/src',
'proto_in_dir%': '.', 'proto_in_dir%': '.',
'stamp_file': '<(java_out_dir).stamp', 'stamp_file': '<(java_out_dir).stamp',
# Variables needed by java.gypi below. 'script': '<(DEPTH)/build/protoc_java.py',
# The rest of the variables here are for the java.gypi include.
'package_name': '<(_target_name)', 'package_name': '<(_target_name)',
'java_in_dir': '<(DEPTH)/build/android/empty', 'java_in_dir': '<(DEPTH)/build/android/empty',
'script': '<(DEPTH)/build/protoc_java.py',
'generated_src_dirs': ['<(java_out_dir)'], 'generated_src_dirs': ['<(java_out_dir)'],
# Adding the |stamp_file| to |additional_input_paths| makes the actions in
# the include of java.gypi depend on the genproto_java action.
'additional_input_paths': ['<(stamp_file)'],
}, },
'actions': [ 'actions': [
{ {