Commit 75523ec0 authored by Yilun Chong's avatar Yilun Chong

fix bugs

parent 34843edd
[submodule "third_party/benchmark"] [submodule "third_party/benchmark"]
path = third_party/benchmark path = third_party/benchmark
url = https://github.com/google/benchmark.git url = https://github.com/google/benchmark.git
...@@ -125,8 +125,8 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark ...@@ -125,8 +125,8 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark
############# JAVA RULES ############## ############# JAVA RULES ##############
java_benchmark_testing_files = java_benchmark_testing_files =
java/src/main/java/com/google/protocolbuffers/ProtoBench.java \ java/src/main/java/com/google/protobuf/ProtoBench.java \
java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2 javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2
cp -r java tmp && cd tmp/java && mvn clean compile assembly:single cp -r java tmp && cd tmp/java && mvn clean compile assembly:single
......
...@@ -91,4 +91,5 @@ ...@@ -91,4 +91,5 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>
\ No newline at end of file
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