From 7cb831d1646c627c92a55174bf2db63a57b4bd26 Mon Sep 17 00:00:00 2001 From: Mike Grabowski Date: Sun, 17 Dec 2017 22:34:07 +0100 Subject: [PATCH] Revert "Fixes for migrating to Buck's source-only ABI feature" This reverts commit 71006f74cdafdae7212c8a10603fb972c6ee338c. --- .../react/flat/FlatUIViewOperationQueue.java | 25 +++++++++---------- .../java/com/facebook/react/views/modal/BUCK | 1 - .../java/com/facebook/react/views/text/BUCK | 1 - .../com/facebook/react/views/textinput/BUCK | 1 - .../com/facebook/react/views/viewpager/BUCK | 1 - 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java index d2f9bd4e601..2d0f44b5fed 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java @@ -9,7 +9,6 @@ package com.facebook.react.flat; -import com.facebook.react.uimanager.UIViewOperationQueue; import android.util.SparseIntArray; import android.view.View; import android.view.ViewGroup; @@ -35,7 +34,7 @@ import javax.annotation.Nullable; private final FlatNativeViewHierarchyManager mNativeViewHierarchyManager; private final ProcessLayoutRequests mProcessLayoutRequests = new ProcessLayoutRequests(); - private final class ProcessLayoutRequests implements UIViewOperationQueue.UIOperation { + private final class ProcessLayoutRequests implements UIOperation { @Override public void execute() { FlatViewGroup.processLayoutRequests(); @@ -45,7 +44,7 @@ import javax.annotation.Nullable; /** * UIOperation that updates DrawCommands for a View defined by reactTag. */ - private final class UpdateMountState implements UIViewOperationQueue.UIOperation { + private final class UpdateMountState implements UIOperation { private final int mReactTag; private final @Nullable DrawCommand[] mDrawCommands; @@ -76,7 +75,7 @@ import javax.annotation.Nullable; /** * UIOperation that updates DrawCommands for a View defined by reactTag. */ - private final class UpdateClippingMountState implements UIViewOperationQueue.UIOperation { + private final class UpdateClippingMountState implements UIOperation { private final int mReactTag; private final @Nullable DrawCommand[] mDrawCommands; @@ -128,7 +127,7 @@ import javax.annotation.Nullable; } } - private final class UpdateViewGroup implements UIViewOperationQueue.UIOperation { + private final class UpdateViewGroup implements UIOperation { private final int mReactTag; private final int[] mViewsToAdd; @@ -149,7 +148,7 @@ import javax.annotation.Nullable; /** * UIOperation that updates View bounds for a View defined by reactTag. */ - public final class UpdateViewBounds implements UIViewOperationQueue.UIOperation { + public final class UpdateViewBounds implements UIOperation { private final int mReactTag; private final int mLeft; @@ -171,7 +170,7 @@ import javax.annotation.Nullable; } } - private final class SetPadding implements UIViewOperationQueue.UIOperation { + private final class SetPadding implements UIOperation { private final int mReactTag; private final int mPaddingLeft; @@ -203,7 +202,7 @@ import javax.annotation.Nullable; } } - private final class DropViews implements UIViewOperationQueue.UIOperation { + private final class DropViews implements UIOperation { private final SparseIntArray mViewsToDrop; @@ -221,7 +220,7 @@ import javax.annotation.Nullable; } } - private final class MeasureVirtualView implements UIViewOperationQueue.UIOperation { + private final class MeasureVirtualView implements UIOperation { private final int mReactTag; private final float mScaledX; @@ -285,7 +284,7 @@ import javax.annotation.Nullable; } } - public final class DetachAllChildrenFromViews implements UIViewOperationQueue.UIOperation { + public final class DetachAllChildrenFromViews implements UIOperation { private @Nullable int[] mViewsToDetachAllChildrenFrom; public void setViewsToDetachAllChildrenFrom(int[] viewsToDetachAllChildrenFrom) { @@ -298,7 +297,7 @@ import javax.annotation.Nullable; } } - private final class FindTargetForTouchOperation implements UIViewOperationQueue.UIOperation { + private final class FindTargetForTouchOperation implements UIOperation { private final int mReactTag; private final float mTargetX; @@ -374,7 +373,7 @@ import javax.annotation.Nullable; * Used to delay view manager command dispatch until after the view hierarchy is updated. * Mirrors command operation dispatch, but is only used in Nodes for view manager commands. */ - public final class ViewManagerCommand implements UIViewOperationQueue.UIOperation { + public final class ViewManagerCommand implements UIOperation { private final int mReactTag; private final int mCommand; @@ -469,7 +468,7 @@ import javax.annotation.Nullable; return new ViewManagerCommand(reactTag, command, args); } - /* package */ void enqueueFlatUIOperation(UIViewOperationQueue.UIOperation operation) { + /* package */ void enqueueFlatUIOperation(UIOperation operation) { enqueueUIOperation(operation); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK index eb762eb77a2..deadbd49ac1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK @@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS") android_library( name = "modal", srcs = glob(["*.java"]), - required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK index 23f63bf2e6c..5f5ecfd0fc8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK @@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS") android_library( name = "text", srcs = glob(["*.java"]), - required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK index 141713bc05f..1cb749f65ce 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK @@ -6,7 +6,6 @@ android_library( provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], - required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK index 1763cda5de8..9e6a4b65cda 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK @@ -6,7 +6,6 @@ android_library( provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], - required_for_source_only_abi = True, visibility = [ "PUBLIC", ],