Upgrades J2ObjC protocol buffers to be compatible with protobuf-3.2.0.

Change on 2017/04/10 by kstanger <kstanger@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=152686355
google · Apr 11, 2017 · 558e416 · 558e416
1 parent 8dd2e46
commit 558e416
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 1,626 deletions.
diff --git a/java_deps/jars.mk b/java_deps/jars.mk
@@ -19,7 +19,7 @@ JARJAR_JAR = jarjar-1.4.jar
 JAVA_DEPS_JAR_DIR = $(J2OBJC_ROOT)/java_deps/$(BUILD_DIR_NAME)
 JUNIT_JAR = j2objc_junit.jar
 
-PROTOBUF_JAR = protobuf-java-2.6.1.jar
+PROTOBUF_JAR = protobuf-java-3.2.0.jar
 
 ECLIPSE_JARS = \
     org.eclipse.core.contenttype-3.4.200.v20140207-1251.jar \

diff --git a/java_deps/pom.xml b/java_deps/pom.xml
@@ -232,7 +232,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <version>3.2.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/protobuf/compiler/Makefile b/protobuf/compiler/Makefile
@@ -23,8 +23,7 @@ SRCS = \
   google/protobuf/compiler/j2objc/j2objc_file.cc \
   google/protobuf/compiler/j2objc/j2objc_generator.cc \
   google/protobuf/compiler/j2objc/j2objc_helpers.cc \
-  google/protobuf/compiler/j2objc/j2objc_message.cc \
-  google/protobuf/stubs/strutil.cc
+  google/protobuf/compiler/j2objc/j2objc_message.cc
 
 OBJS = $(SRCS:%.cc=$(BUILD_DIR)/%.o)
 
@@ -66,10 +65,6 @@ $(BUILD_DIR)/%.o: src/%.cc
 	@mkdir -p $(@D)
 	$(CXX) -MD -c -o $@ $(CXXFLAGS) $<
 
-$(BUILD_DIR)/%.o: ../google/src/%.cc
-	@mkdir -p $(@D)
-	$(CXX) -MD -c -o $@ $(CXXFLAGS) $<
-
 $(PROTOC_EXE): $(OBJS) $(MAIN_OBJ)
 	$(CXX) $(LDFLAGS) -o $@ $^