(These changes apply ONLY to our Google-internal Android-specific copy of Guava.)

- Hackily disable use of Unsafe and ClassValue as a temporary measure.
- Strip comment reference to @ForOverride, which was impeding import stripping.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=101034385

Author: cpovirk

guava/src/com/google/common/util/concurrent/AbstractFuture.java

@@ -23,7 +23,6 @@
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.base.Throwables;
-import com.google.errorprone.annotations.ForOverride;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -110,7 +109,7 @@ abstract static class TrustedFuture<V> extends AbstractFuture<V> {
   static {
     AtomicHelper helper = null;
     try {
-      helper = new UnsafeAtomicHelper();
+      helper = UnsafeAtomicHelperFactory.values()[0].tryCreateUnsafeAtomicHelper();
     } catch (Throwable e) {
       // catch absolutely everything and fall through
     }
@@ -764,7 +763,6 @@ private void complete() {
    *
    * <p>This is called exactly once, after all listeners have executed.  By default it does nothing.
    */
-  // TODO(cpovirk): @ForOverride if https://github.com/google/error-prone/issues/342 permits
   void done() {}
 
   /**
@@ -848,12 +846,40 @@ private abstract static class AtomicHelper {
     abstract boolean casValue(AbstractFuture future, Object expected, Object v);
   }
 
+  /**
+   * Temporary hack to hide the reference to {@link UnsafeAtomicHelper} from Android. The caller of
+   * this code will execute {@link #tryCreateUnsafeAtomicHelper} on the <b>first</b> enum value
+   * present. On the server, this will try to create {@link UnsafeAtomicHelper}. On Android, it will
+   * just return {@code null}.
+   */
+  private enum UnsafeAtomicHelperFactory {
+    @SuppressUnderAndroid // temporarily while we make Proguard tolerate Unsafe
+    REALLY_TRY_TO_CREATE {
+      @Override
+      AtomicHelper tryCreateUnsafeAtomicHelper() {
+        return new UnsafeAtomicHelper();
+      }
+    },
+
+    DONT_EVEN_TRY_TO_CREATE {
+      @Override
+      AtomicHelper tryCreateUnsafeAtomicHelper() {
+        return null;
+      }
+    },
+
+  ;
+
+    abstract AtomicHelper tryCreateUnsafeAtomicHelper();
+  }
+
   /**
    * {@link AtomicHelper} based on {@link sun.misc.Unsafe}.
    *
    * <p>Static initialization of this class will fail if the {@link sun.misc.Unsafe} object cannot
    * be accessed.
    */
+  @SuppressUnderAndroid // temporarily while we make Proguard tolerate Unsafe
   private static final class UnsafeAtomicHelper extends AtomicHelper {
     static final sun.misc.Unsafe UNSAFE;
     static final long LISTENERS_OFFSET;
@@ -899,26 +925,31 @@ private static final class UnsafeAtomicHelper extends AtomicHelper {
       }
     }
 
-    @Override void putThread(Waiter waiter, Thread thread) {
+    @Override
+    void putThread(Waiter waiter, Thread thread) {
       UNSAFE.putObject(waiter, WAITER_THREAD_OFFSET, thread);
     }
 
-    @Override void putNext(Waiter waiter, Waiter next) {
+    @Override
+    void putNext(Waiter waiter, Waiter next) {
       UNSAFE.putObject(waiter, WAITER_NEXT_OFFSET, next);
     }
 
     /** Performs a CAS operation on the {@link #waiters} field. */
-    @Override boolean casWaiters(AbstractFuture future, Waiter curr, Waiter next) {
+    @Override
+    boolean casWaiters(AbstractFuture future, Waiter curr, Waiter next) {
       return UNSAFE.compareAndSwapObject(future, WAITERS_OFFSET, curr, next);
     }
 
     /** Performs a CAS operation on the {@link #listeners} field. */
-    @Override boolean casListeners(AbstractFuture future, Listener curr, Listener next) {
+    @Override
+    boolean casListeners(AbstractFuture future, Listener curr, Listener next) {
       return UNSAFE.compareAndSwapObject(future, LISTENERS_OFFSET, curr, next);
     }
 
     /** Performs a CAS operation on the {@link #value} field. */
-    @Override boolean casValue(AbstractFuture future, Object expected, Object v) {
+    @Override
+    boolean casValue(AbstractFuture future, Object expected, Object v) {
       return UNSAFE.compareAndSwapObject(future, VALUE_OFFSET, expected, v);
     }
   }

guava/src/com/google/common/util/concurrent/FuturesGetChecked.java

@@ -100,6 +100,7 @@ static GetCheckedTypeValidator weakSetValidator() {
   }
 
   @J2ObjCIncompatible // ClassValue
+  @SuppressUnderAndroid // ClassValue
   @VisibleForTesting
   static GetCheckedTypeValidator classValueValidator() {
     return GetCheckedTypeValidatorHolder.ClassValueValidator.INSTANCE;
@@ -120,6 +121,7 @@ static class GetCheckedTypeValidatorHolder {
 
     @IgnoreJRERequirement // getChecked falls back to another implementation if necessary
     @J2ObjCIncompatible // ClassValue
+    @SuppressUnderAndroid // ClassValue
     enum ClassValueValidator implements GetCheckedTypeValidator {
       INSTANCE;
 

guava-tests/test/com/google/common/util/concurrent/SuppressUnderAndroid.java guava/src/com/google/common/util/concurrent/SuppressUnderAndroid.java

@@ -29,9 +29,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Signifies that a test should not be run under Android. This annotation is respected only by our
- * Google-internal Android suite generators. Note that those generators also suppress any test
- * annotated with MediumTest or LargeTest.
+ * Signifies that a member should be stripped from the internal Android flavor of Guava. This
+ * annotation is respected only by our Google-internal build system. Note that that system also
+ * strips any test annotated with MediumTest or LargeTest.
+ *
+ * TODO(cpovirk): Replicate this revised description to other copies of the annotation, or better
+ * yet, eliminate the need to use it in prod code, revert the description, and move it back to the
+ * test directory.
  *
  * <p>For more discussion, see {@linkplain com.google.common.base.SuppressUnderAndroid the
  * documentation on another copy of this annotation}.