Revert D8786185: [fabric][android] Create CXX Binding

Differential Revision: D8786185 Original commit changeset: d04208f07813 fbshipit-source-id: 1fc1648146ea9784bb364c4e56e8664bb8bb655f
facebook · Jul 17, 2018 · f5f27b3 · f5f27b3
1 parent bf22d90
commit f5f27b3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -9,11 +9,10 @@
 
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.NativeMap;
-import com.facebook.react.bridge.UIManager;
 
 public interface FabricBinding {
 
-  void installFabric(JavaScriptContextHolder jsContext, FabricBinder fabricBinder);
+  void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule);
 
   void releaseEventTarget(long jsContextNativePointer, long eventTargetPointer);
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -60,7 +60,7 @@
  */
 @SuppressWarnings("unused") // used from JNI
 @DoNotStrip
-public class FabricUIManager implements UIManager, JSHandler, FabricBinder {
+public class FabricUIManager implements UIManager, JSHandler {
 
   private static final String TAG = FabricUIManager.class.getSimpleName();
   private static final boolean DEBUG = ReactBuildConfig.DEBUG || PrinterHolder.getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER);
@@ -98,7 +98,6 @@ public FabricUIManager(
     mJSContext = jsContext;
   }
 
-  @Override
   public void setBinding(FabricBinding binding) {
     mBinding = binding;
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java
@@ -10,8 +10,6 @@
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.FabricBinder;
 import com.facebook.react.fabric.FabricBinding;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.bridge.NativeMap;
@@ -60,7 +58,7 @@ public FabricJSCBinding() {
   }
 
   @Override
-  public void installFabric(JavaScriptContextHolder jsContext, FabricBinder fabricModule) {
+  public void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule) {
     fabricModule.setBinding(this);
     installFabric(jsContext.get(), fabricModule);
   }