LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update idegen for guava 27.1"

Browse Source
This commit is contained in:
Colin Cross
2019-04-16 23:14:12 +00:00
committed by Gerrit Code Review
parent 1b9cc3a63f cf6423f70d
commit 236e021c47
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idegen/src/com/android/idegen/MakeFileParser.java
View File

@@ -16,7 +16,7 @@
package com.android.idegen; 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.Preconditions;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.base.Strings; import com.google.common.base.Strings;
@@ -80,7 +80,7 @@ public class MakeFileParser {
@Override @Override
public String toString() { 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> { private class MakeFileLineProcessor implements LineProcessor<Object> {

3
tools/idegen/src/com/android/idegen/Module.java
View File

@@ -16,6 +16,7 @@
package com.android.idegen; package com.android.idegen;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@@ -380,7 +381,7 @@ public class Module {
@Override @Override
public String toString() { public String toString() {
return Objects.toStringHelper(this) return MoreObjects.toStringHelper(this)
.add("name", getName()) .add("name", getName())
.add("allDependencies", allDependencies) .add("allDependencies", allDependencies)
.add("iml files", allDependentImlFiles).add("imlFile", imlFile) .add("iml files", allDependentImlFiles).add("imlFile", imlFile)