Global cleanup change.

--
MOS_MIGRATED_REVID=117717104

4 files changed, 6 insertions, 10 deletions

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 bca53a7761..fe90bda188 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 @@ public class AndroidResourceProcessor {
       // 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 @@ public class AndroidResourceProcessor {
       // 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 @@ public class AndroidResourceProcessor {
       // 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 a2856160c9..256ae19c05 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 @@ package com.google.devtools.build.android;
 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.EnumSet;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * Filters a {@link MergedAndroidData} resource drawables to the specified densities.
  */
@@ -291,7 +289,7 @@ public class DensitySpecificResourceFilter {
       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 3dcfca2889..fa6d9bbf7c 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 @@ public class FileDeDuplicator implements DirectoryModifier {
     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 3784343c84..ea31a862c0 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 @@ class PackedResourceTarExpander implements DirectoryModifier {
           outDirs.add(root);
         }
       } catch (IOException e) {
-        Throwables.propagate(e);
+        throw new RuntimeException(e);
       }
     }
     return outDirs.build();