summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 18:03:19 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 18:03:19 +0000
commit5f716a97d69a5f1fbc1ad3282bce1969db2eb037 (patch)
tree8802347b10c19ff33eeb9c4a5bc1b44e1b724099
parent6b47bc42d8a405eddfabea82d351af6922f3f363 (diff)
downloadchromium_src-5f716a97d69a5f1fbc1ad3282bce1969db2eb037.zip
chromium_src-5f716a97d69a5f1fbc1ad3282bce1969db2eb037.tar.gz
chromium_src-5f716a97d69a5f1fbc1ad3282bce1969db2eb037.tar.bz2
Fix protobuf_lite_java action ordering in gyp.
The ordering of actions within protobuf_lite_java was non-deterministic. With this CL action B depends on action A, and as such the order is deterministic. BUG=161967 Review URL: https://codereview.chromium.org/11308125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168835 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/protobuf/protobuf.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index f337124..98b0f68 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -86,6 +86,9 @@
'java_in_dir': 'java',
'maven_pom': '<(java_in_dir)/pom.xml',
'javac_includes': ['<!@(<(script_pom) <(maven_pom))'],
+ 'additional_input_paths': [
+ '<(java_out_dir)/com/google/protobuf/DescriptorProtos.java'
+ ],
},
'actions': [
{