Global cleanup change.
--
MOS_MIGRATED_REVID=117717104
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index bca53a7..fe90bda 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -222,7 +222,7 @@
// Set to the epoch for caching purposes.
Files.setLastModifiedTime(rOutput, FileTime.fromMillis(0L));
} catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -239,7 +239,7 @@
// Set to the epoch for caching purposes.
Files.setLastModifiedTime(srcJar, FileTime.fromMillis(0L));
} catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
@@ -257,7 +257,7 @@
// Set to the epoch for caching purposes.
Files.setLastModifiedTime(manifestOut, FileTime.fromMillis(0L));
} catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
index a285616..256ae19 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java
@@ -16,7 +16,6 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -40,7 +39,6 @@
import java.util.List;
import java.util.Map;
-
/**
* Filters a {@link MergedAndroidData} resource drawables to the specified densities.
*/
@@ -291,7 +289,7 @@
Files.walkFileTree(unFilteredResourceDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS),
Integer.MAX_VALUE, fileVisitor);
} catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
removeResources(getResourceToRemove(fileVisitor.getCopiedFiles()));
return filteredResourceDir;
diff --git a/src/tools/android/java/com/google/devtools/build/android/FileDeDuplicator.java b/src/tools/android/java/com/google/devtools/build/android/FileDeDuplicator.java
index 3dcfca2..fa6d9bb 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FileDeDuplicator.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FileDeDuplicator.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.android;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
@@ -131,7 +130,7 @@
try {
return conditionallyCopy(directories);
} catch (IOException e) {
- throw Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/PackedResourceTarExpander.java b/src/tools/android/java/com/google/devtools/build/android/PackedResourceTarExpander.java
index 3784343..ea31a86 100644
--- a/src/tools/android/java/com/google/devtools/build/android/PackedResourceTarExpander.java
+++ b/src/tools/android/java/com/google/devtools/build/android/PackedResourceTarExpander.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.android;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableSet;
@@ -107,7 +106,7 @@
outDirs.add(root);
}
} catch (IOException e) {
- Throwables.propagate(e);
+ throw new RuntimeException(e);
}
}
return outDirs.build();