1 files changed, 6 insertions, 9 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/DataSourceTable.java b/src/tools/android/java/com/google/devtools/build/android/DataSourceTable.java
index 53be389d9f..ac953da711 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataSourceTable.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataSourceTable.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.android;
 
 import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.android.proto.SerializeFormat;
@@ -29,6 +28,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
+import java.util.stream.Collectors;
 
 /**
  * Tracks mappings from resource source paths (/foo/bar/res/values/colors.xml) to an ID for a more
@@ -36,13 +36,7 @@ import java.util.NavigableMap;
  */
 class DataSourceTable {
 
-  private static final Function<DataValue, DataSource> VALUE_TO_SOURCE =
-      new Function<DataValue, DataSource>() {
-        @Override
-        public DataSource apply(DataValue input) {
-          return input.source();
-        }
-      };
+  private static final Function<DataValue, DataSource> VALUE_TO_SOURCE = DataValue::source;
   private final Map<DataSource, Integer> sourceTable = new LinkedHashMap<>();
   private DataSource[] idToSource;
 
@@ -73,7 +67,10 @@ class DataSourceTable {
       throws IOException {
     int sourceNumber = 0;
     LinkedList<DataSource> sourceQueue =
-        new LinkedList<>(Collections2.transform(map.values(), VALUE_TO_SOURCE));
+        map.values()
+            .stream()
+            .map(VALUE_TO_SOURCE)
+            .collect(Collectors.toCollection(LinkedList::new));
     while (!sourceQueue.isEmpty()) {
       DataSource source = sourceQueue.pop();
       if (!sourceTable.containsKey(source)) {