From cf6423f70df82af13cfd676cc9428686b4334882 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 11 Apr 2019 14:25:31 -0700
Subject: [PATCH] Update idegen for guava 27.1

Objects.toStringHelper has been replaced with
MoreObjects.toStringHelper.

Bug: 130306229
Test: m checkbuild
Change-Id: I0110d355aa071f3f5c8174c7dfa3c8403ac8f596
Merged-In: I0110d355aa071f3f5c8174c7dfa3c8403ac8f596
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 9502c0fe6ac14513977f9cf251becd4aa8095a54)
---
 tools/idegen/src/com/android/idegen/MakeFileParser.java | 4 ++--
 tools/idegen/src/com/android/idegen/Module.java         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/idegen/src/com/android/idegen/MakeFileParser.java b/tools/idegen/src/com/android/idegen/MakeFileParser.java
index a48c704b1..7b099fda3 100644
--- a/tools/idegen/src/com/android/idegen/MakeFileParser.java
+++ b/tools/idegen/src/com/android/idegen/MakeFileParser.java
@@ -16,7 +16,7 @@
 
 package com.android.idegen;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
@@ -80,7 +80,7 @@ public class MakeFileParser {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("values", values).toString();
+        return MoreObjects.toStringHelper(this).add("values", values).toString();
     }
 
     private class MakeFileLineProcessor implements LineProcessor<Object> {
diff --git a/tools/idegen/src/com/android/idegen/Module.java b/tools/idegen/src/com/android/idegen/Module.java
index 73ed57382..40dca978f 100644
--- a/tools/idegen/src/com/android/idegen/Module.java
+++ b/tools/idegen/src/com/android/idegen/Module.java
@@ -16,6 +16,7 @@
 
 package com.android.idegen;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -380,7 +381,7 @@ public class Module {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("name", getName())
                 .add("allDependencies", allDependencies)
                 .add("iml files", allDependentImlFiles).add("imlFile", imlFile)