ProGuard: Do not strip anything from FabricUIManager

Summary:
Instead of annotating individual methods with DoNotStrip, we actually want to ensure that nothing in this class gets stripped out.

This also upgrades the yoga/proguard-annotations package for Gradle builds.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D27335181

fbshipit-source-id: 5b696c26faf4d1b32a3fd885e42a996aff23f0be

ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK

@@ -9,8 +9,8 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "annotations-binary.jar",
-    sha1 = "3d015bb821875657ac8e4b808a223aae339defb2",
-    url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.jar",
+    sha1 = "95ff77fd4870136a0454dd7ccad8813db87bd9ab",
+    url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.17.0/proguard-annotations-1.17.0.jar",
 )
 
 rn_android_library(

ReactAndroid/src/main/java/com/facebook/proguard/annotations/proguard_annotations.pro

@@ -6,6 +6,7 @@
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStripAny
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
 
 # Do not strip any method/class that is annotated with @DoNotStrip

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -34,7 +34,7 @@ import com.facebook.common.logging.FLog;
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
 import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.proguard.annotations.DoNotStripAny;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeMap;
@@ -86,7 +86,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+/**
+ * We instruct ProGuard not to strip out any fields or methods, because many of these methods are
+ * only called through the JNI from Cxx so it appears that most of this class is "unused".
+ */
 @SuppressLint("MissingNativeLoadLibrary")
+@DoNotStripAny
 public class FabricUIManager implements UIManager, LifecycleEventListener {
   public static final String TAG = FabricUIManager.class.getSimpleName();
 
@@ -284,7 +289,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   }
 
   /** Method called when an event has been dispatched on the C++ side. */
-  @DoNotStrip
   @SuppressWarnings("unused")
   public void onRequestEventBeat() {
     mEventDispatcher.dispatchAllEvents();
@@ -356,7 +360,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     }
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   private NativeArray measureLines(
       ReadableMap attributedString, ReadableMap paragraphAttributes, float width, float height) {
@@ -368,7 +371,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
             PixelUtil.toPixelFromDIP(width));
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   private NativeArray measureLinesMapBuffer(
       ReadableMapBuffer attributedString,
@@ -383,7 +385,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
             PixelUtil.toPixelFromDIP(width));
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   private long measure(
       int rootTag,
@@ -408,7 +409,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
         null);
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   private long measure(
       int surfaceId,
@@ -447,7 +447,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
         attachmentsPositions);
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   private long measureMapBuffer(
       int surfaceId,
@@ -491,7 +490,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    *     padding used by RN Android TextInput.
    * @return if theme data is available in the output parameters.
    */
-  @DoNotStrip
   public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) {
     SurfaceMountingManager surfaceMountingManager =
         mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData");
@@ -590,7 +588,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
         ReactMarkerConstants.FABRIC_UPDATE_UI_MAIN_THREAD_END, null, commitNumber);
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   @AnyThread
   @ThreadConfined(ANY)
@@ -612,7 +609,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
             isLayoutable));
   }
 
-  @DoNotStrip
   @SuppressWarnings("unused")
   @AnyThread
   @ThreadConfined(ANY)
@@ -626,7 +622,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    * to enforce execution order using {@link ReactChoreographer.CallbackType}. This method should
    * only be called as the result of a new tree being committed.
    */
-  @DoNotStrip
   @SuppressWarnings("unused")
   @AnyThread
   @ThreadConfined(ANY)
@@ -825,7 +820,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
         new DispatchIntCommandMountItem(surfaceId, reactTag, commandId, commandArgs));
   }
 
-  @DoNotStrip
   @AnyThread
   @ThreadConfined(ANY)
   public void dispatchCommand(
@@ -846,7 +840,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     mMountItemDispatcher.addMountItem(new SendAccessibilityEvent(View.NO_ID, reactTag, eventType));
   }
 
-  @DoNotStrip
   @AnyThread
   @ThreadConfined(ANY)
   public void sendAccessibilityEventFromJS(int surfaceId, int reactTag, String eventTypeJS) {
@@ -871,7 +864,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    * @param initialReactTag React tag of the JS view that initiated the touch operation
    * @param blockNativeResponder If native responder should be blocked or not
    */
-  @DoNotStrip
   public void setJSResponder(
       final int surfaceId,
       final int reactTag,
@@ -905,7 +897,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    * Clears the JS Responder specified by {@link #setJSResponder}. After this method is called, all
    * the touch events are going to be handled by JS.
    */
-  @DoNotStrip
   public void clearJSResponder() {
     if (ReactFeatureFlags.enableJSResponder) {
       mMountItemDispatcher.addMountItem(
@@ -942,14 +933,12 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   }
 
   // Called from Binding.cpp
-  @DoNotStrip
   @AnyThread
   public void onAnimationStarted() {
     mDriveCxxAnimations = true;
   }
 
   // Called from Binding.cpp
-  @DoNotStrip
   @AnyThread
   public void onAllAnimationsComplete() {
     mDriveCxxAnimations = false;