Change only for testing sync to repo.

PiperOrigin-RevId: 263557461

Makefile

@@ -70,7 +70,6 @@ dist: print_environment translator_dist jre_emul_dist junit_dist jsr305_dist \
 
 protobuf_dist: protobuf_compiler_dist protobuf_runtime_dist
 
-
 all_dist: dist all_frameworks examples_dist
 
 clean:
@@ -110,7 +109,6 @@ test: test_translator test_jre_emul test_cycle_finder test_jre_cycles
 test_protobuf: junit_dist protobuf_compiler_dist protobuf_runtime_dist
 	@cd protobuf/tests && $(MAKE) test
 
-
 test_all: test test_protobuf
 
 examples_dist: install_examples

cycle_finder/.classpath

@@ -8,7 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/annotations"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/guava-25.1-jre.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="../java_deps/build_result/javac.jar"/>
-	<classpathentry kind="lib" path="../java_deps/build_result/scenelib.jar"/>
+	<classpathentry kind="lib" path="../java_deps/build_result/tools.jar"/>
 	<classpathentry kind="output" path="build_result/eclipse"/>
 </classpath>

examples/Contacts/resources/org/contacts/starter_contacts.txt

@@ -1,4 +1,4 @@
 Mad Hatter
 123-456-7890
 Red Queen
-555-555-5555
+555-555-5556

java_deps/Makefile

@@ -48,7 +48,6 @@ DOCLET_JARS = $(DOCLAVA_JAR) $(JSILVER_JAR)
 BUILD_DIR_JARS = $(DISTRIBUTION_JARS:%=$(BUILD_DIR)/%) $(INTERNAL_JARS:%=$(BUILD_DIR)/%)
 BUILD_DIR_DOCLET_JARS = $(DOCLET_JARS:%=$(BUILD_DIR)/%)
 
-
 $(BUILD_DIR_JARS): $(BUILD_DIR)/.maven_generate
 
 # Postprocessing: update procyon to not depend on URLClassPath.

jre_emul/Makefile

@@ -249,4 +249,3 @@ $(DIST_LICENSE_DIR)/icu_license.txt: icu4c/LICENSE
 $(DIST_LICENSE_DIR)/openjdk_license.txt: openjdk/LICENSE
 	@mkdir -p $(@D)
 	@install -m 0644 $< $@
-

jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/regex/Matcher.java

@@ -619,7 +619,6 @@ public Matcher appendReplacement(StringBuffer sb, String replacement) {
         return this;
     }
 
-
     /**
      * Internal helper method to append a given string to a given string buffer.
      * If the string contains any references to groups, these are replaced by
@@ -653,7 +652,6 @@ private void appendEvaluated(StringBuffer buffer, String s) {
         }
     }
 
-
     /**
      * Implements a terminal append-and-replace step.
      *
@@ -676,7 +674,6 @@ public StringBuffer appendTail(StringBuffer sb) {
     }
 
 
-
     /**
      * Replaces every subsequence of the input sequence that matches the
      * pattern with the given replacement string.

jre_emul/java.mk

@@ -114,4 +114,3 @@ find_cycles: cycle_finder_dist $(JAVA_SOURCES_MANIFEST)
 	$(DIST_DIR)/cycle_finder --patch-module java.base=$(JRE_SRC) \
 	  -w cycle_whitelist.txt -s $(JAVA_SOURCES_MANIFEST) \
 	  -external-annotation-file $(J2OBJC_ANNOTATIONS)
-

junit/Makefile

@@ -119,4 +119,3 @@ find_cycles: $(JAVA_SOURCES_MANIFEST) | cycle_finder_dist jre_emul_java_manifest
 	$(DIST_DIR)/cycle_finder -sourcepath $(JAVA_SRC_DIR) -source 1.7 \
       -cp $(CLASSPATH) -w cycle_whitelist.txt -w ../jre_emul/cycle_whitelist.txt \
       -s ../jre_emul/$(BUILD_DIR_NAME)/java_sources.mf -s $(JAVA_SOURCES_MANIFEST)
-

make/j2objc_deps.mk

@@ -96,7 +96,6 @@ xalan_dist: translator_dist jre_emul_dist
 xalan_java: java_deps_dist jre_emul_jars_dist
 	@$(MAKE) -C $(J2OBJC_ROOT)/xalan java
 
-
 else
 
 annotations_dist:

protobuf/compiler/src/google/protobuf/compiler/j2objc/common.h

@@ -40,7 +40,6 @@
 #ifndef GOOGLE_PROTOBUF_COMPILER_J2OBJC_COMMON_H__
 #define GOOGLE_PROTOBUF_COMPILER_J2OBJC_COMMON_H__
 
-
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
@@ -51,5 +50,4 @@
 
 using namespace google::protobuf::compiler;
 
-
 #endif  // GOOGLE_PROTOBUF_COMPILER_J2OBJC_COMMON_H__

protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc

@@ -56,7 +56,6 @@ const char *kOuterClassNameSuffix = "OuterClass";
 // j2objc-descriptor.proto.
 const int kPackagePrefixFieldNumber = 102687446;
 
-
 static std::map<string, string> prefixes;
 static std::map<string, string> wildcardPrefixes;
 
@@ -300,7 +299,6 @@ string FileJavaPackage(const FileDescriptor* file) {
     }
   }
 
-
   return result;
 }
 

protobuf/google/src/google/protobuf/stubs/strutil.h

@@ -28,7 +28,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef GOOGLE_PROTOBUF_STUBS_STRUTIL_H__
 #define GOOGLE_PROTOBUF_STUBS_STRUTIL_H__
 

scripts/parse_proto.py

@@ -63,7 +63,6 @@ def MatchOptions(line, data):
   if match:
     data.java_package = match.group(1)
 
-
   # outer classname
   match = re.match(r'option\s+java_outer_classname\s*=\s*"([^"]+)"', line)
   if match:

testing/junit_ext/src/objc/TestRunnerMain.m

@@ -1,4 +1,3 @@
-
 #import "com/google/j2objc/testing/JUnitTestRunner.h"
 
 #include "java/lang/Thread.h"

translator/src/main/java/com/google/devtools/j2objc/Options.java

@@ -239,7 +239,6 @@ public GenerationUnit globalGenerationUnit() {
       ImmutableSet.of("--patch-module", "--system", "--add-reads");
   private final List<String> platformModuleSystemOptions = new ArrayList<>();
 
-
   static {
     // Load string resources.
     URL propertiesUrl = Resources.getResource(J2ObjC.class, "J2ObjC.properties");

tree_shaker/.classpath

@@ -8,6 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/annotations"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/guava-25.1-jre.jar"/>
-	<classpathentry kind="lib" path="../java_deps/build_result/javac.jar"/>
+	<classpathentry kind="lib" path="../java_deps/build_result/tools.jar"/>
 	<classpathentry kind="output" path="build_result/eclipse"/>
 </classpath>