Modify Immutable* classes to (hopefully) compile on the Mac buildandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1froyo-release

servers (whatever weird Java version they're using).

Change-Id: I7ed1872f6490df3db879ad7600b1bfc7aaa929b1

7 files changed, 22 insertions, 7 deletions

diff --git a/README.android b/README.android
index 10e5c9552..3a51fdad0 100644
--- a/README.android
+++ b/README.android
@@ -2,7 +2,10 @@ URL: http://code.google.com/p/guava-libraries/source/checkout
 Version: r11
 License: Apache 2
 Description: "Guava: Google Core Libraries for Java 1.5"
-Local Modifications: No local modifications
+
+Local Modifications: Minor hacks to compile on our Mac build machines --
+   see src/com/google/common/collect/Immutable*.java, look for
+   "BEGIN/END android-changed" markers.
 
 Guava-libraries are a grab bag of utility libraries published by Google as
 open source, including among other things the Google collections libraries.
diff --git a/src/com/google/common/collect/ImmutableList.java b/src/com/google/common/collect/ImmutableList.java
index d6ae7701b..2957fa58d 100644
--- a/src/com/google/common/collect/ImmutableList.java
+++ b/src/com/google/common/collect/ImmutableList.java
@@ -64,7 +64,9 @@ public abstract class ImmutableList<E> extends ImmutableCollection<E>
   // Casting to any type is safe because the list will never hold any elements.
   @SuppressWarnings("unchecked")
   public static <E> ImmutableList<E> of() {
-    return (ImmutableList<E>) EmptyImmutableList.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableList) EmptyImmutableList.INSTANCE;
+    // END android-changed
   }
 
   /**
diff --git a/src/com/google/common/collect/ImmutableListMultimap.java b/src/com/google/common/collect/ImmutableListMultimap.java
index b3dd9abbc..6d0ec602c 100644
--- a/src/com/google/common/collect/ImmutableListMultimap.java
+++ b/src/com/google/common/collect/ImmutableListMultimap.java
@@ -55,7 +55,9 @@ public class ImmutableListMultimap<K, V>
   // Casting is safe because the multimap will never hold any elements.
   @SuppressWarnings("unchecked")
   public static <K, V> ImmutableListMultimap<K, V> of() {
-    return (ImmutableListMultimap<K, V>) EmptyImmutableListMultimap.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableListMultimap) EmptyImmutableListMultimap.INSTANCE;
+    // END android-changed
   }
 
   /**
diff --git a/src/com/google/common/collect/ImmutableMap.java b/src/com/google/common/collect/ImmutableMap.java
index 12174d001..b842b8c35 100644
--- a/src/com/google/common/collect/ImmutableMap.java
+++ b/src/com/google/common/collect/ImmutableMap.java
@@ -59,7 +59,9 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
   // Casting to any type is safe because the set will never hold any elements.
   @SuppressWarnings("unchecked")
   public static <K, V> ImmutableMap<K, V> of() {
-    return (ImmutableMap<K, V>) EmptyImmutableMap.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableMap) EmptyImmutableMap.INSTANCE;
+    // END android-changed
   }
 
   /**
diff --git a/src/com/google/common/collect/ImmutableMultiset.java b/src/com/google/common/collect/ImmutableMultiset.java
index ca1028de6..543b37b23 100644
--- a/src/com/google/common/collect/ImmutableMultiset.java
+++ b/src/com/google/common/collect/ImmutableMultiset.java
@@ -51,7 +51,9 @@ public class ImmutableMultiset<E> extends ImmutableCollection<E>
    */
   @SuppressWarnings("unchecked") // all supported methods are covariant
   public static <E> ImmutableMultiset<E> of() {
-    return (ImmutableMultiset<E>) EmptyImmutableMultiset.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableMultiset) EmptyImmutableMultiset.INSTANCE;
+    // END android-changed
   }
 
   /**
diff --git a/src/com/google/common/collect/ImmutableSet.java b/src/com/google/common/collect/ImmutableSet.java
index eaeea0019..855ba133a 100644
--- a/src/com/google/common/collect/ImmutableSet.java
+++ b/src/com/google/common/collect/ImmutableSet.java
@@ -74,7 +74,9 @@ public abstract class ImmutableSet<E> extends ImmutableCollection<E>
   // Casting to any type is safe because the set will never hold any elements.
   @SuppressWarnings({"unchecked"})
   public static <E> ImmutableSet<E> of() {
-    return (ImmutableSet<E>) EmptyImmutableSet.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableSet) EmptyImmutableSet.INSTANCE;
+    // END android-changed
   }
 
   /**
diff --git a/src/com/google/common/collect/ImmutableSetMultimap.java b/src/com/google/common/collect/ImmutableSetMultimap.java
index eb99796dd..325afff56 100644
--- a/src/com/google/common/collect/ImmutableSetMultimap.java
+++ b/src/com/google/common/collect/ImmutableSetMultimap.java
@@ -58,7 +58,9 @@ public class ImmutableSetMultimap<K, V>
   // Casting is safe because the multimap will never hold any elements.
   @SuppressWarnings("unchecked")
   public static <K, V> ImmutableSetMultimap<K, V> of() {
-    return (ImmutableSetMultimap<K, V>) EmptyImmutableSetMultimap.INSTANCE;
+    // BEGIN android-changed
+    return (ImmutableSetMultimap) EmptyImmutableSetMultimap.INSTANCE;
+    // END android-changed
   }
 
   /**