Commit 1470ced7 authored by Feng Xiao's avatar Feng Xiao

Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime

include plugin.proto and generated code in protobuf-java
parents 3a72a1ee 37b262bf
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
<arg value="../src/google/protobuf/timestamp.proto" /> <arg value="../src/google/protobuf/timestamp.proto" />
<arg value="../src/google/protobuf/type.proto" /> <arg value="../src/google/protobuf/type.proto" />
<arg value="../src/google/protobuf/wrappers.proto" /> <arg value="../src/google/protobuf/wrappers.proto" />
<arg value="../src/google/protobuf/compiler/plugin.proto" />
</exec> </exec>
</tasks> </tasks>
<sourceRoot>target/generated-sources</sourceRoot> <sourceRoot>target/generated-sources</sourceRoot>
...@@ -186,6 +187,7 @@ ...@@ -186,6 +187,7 @@
<include>google/protobuf/timestamp.proto</include> <include>google/protobuf/timestamp.proto</include>
<include>google/protobuf/type.proto</include> <include>google/protobuf/type.proto</include>
<include>google/protobuf/wrappers.proto</include> <include>google/protobuf/wrappers.proto</include>
<include>google/protobuf/compiler/plugin.proto</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment