docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep add keep keep keep keep keep
|
<mask> * We do a similar optimization when searching for matching node regions, as node regions are
<mask> * loosely sorted as well when clipping.
<mask> */
<mask> /* package */ abstract class ClippingDrawCommandManager extends DrawCommandManager {
<mask> private final FlatViewGroup mFlatViewGroup;
<mask> private DrawCommand[] mDrawCommands = DrawCommand.EMPTY_ARRAY;
<mask> protected float[] mCommandMaxBottom = StateBuilder.EMPTY_FLOAT_ARRAY;
<mask> protected float[] mCommandMinTop = StateBuilder.EMPTY_FLOAT_ARRAY;
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
</s> add </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> remove public class ReactModuleInfo implements Info {
</s> add public class ReactModuleInfo { </s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // If we get here, it means we have drawn all the views, now just draw the remaining draw
<mask> // commands.
<mask> while (commandIndex < mStop) {
<mask> mDrawCommands[commandIndex++].draw(mFlatViewGroup, canvas);
<mask> }
<mask> }
<mask>
<mask> @Override
<mask> void debugDraw(Canvas canvas) {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove // We resolve main dimension to fit minimum and maximum values
if (YGFloatIsUndefined(availableInnerMainDim)) {
</s> add // If we don't measure with exact main dimension we want to ensure we don't violate min and max
if (measureModeMainDim != YGMeasureModeExactly) { </s> add if (YGMarginTrailingValue(child, mainAxis)->unit == YGUnitAuto) {
mainDim += remainingFreeSpace / numberOfAutoMarginsOnCurrentLine;
}
</s> remove
</s> add if (child->style.display == YGDisplayNone) {
continue;
} </s> remove if ((isMainAxisRow && widthMeasureMode == YGMeasureModeExactly) ||
(!isMainAxisRow && heightMeasureMode == YGMeasureModeExactly)) {
</s> add if (measureModeMainDim == YGMeasureModeExactly) { </s> add // TODO: findClassStatic only does the lookup once. If we can't find
// QuickPerformanceLoggerProvider the first time we call this, we will always fail here. </s> remove executePendingChoreographerCallbacks();
</s> add executePendingFrameCallbacks();
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> @Override
<mask> public void setPadding(int spacingType, float padding) {
<mask> YogaValue current = getStylePadding(spacingType);
<mask> if (current.unit != YogaUnit.PIXEL || current.value != padding) {
<mask> super.setPadding(spacingType, padding);
<mask> mPaddingChanged = true;
<mask> markUpdated();
<mask> }
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove if (current.unit != YogaUnit.PIXEL || current.value != padding) {
</s> add if (current.unit != YogaUnit.POINT || current.value != padding) { </s> remove if (current.unit != YogaUnit.PIXEL || current.value != padding) {
</s> add if (current.unit != YogaUnit.POINT || current.value != padding) { </s> remove node->style.instanceName[edge].unit != YGUnitPixel) { \
</s> add node->style.instanceName[edge].unit != YGUnitPoint) { \ </s> add
public void setHeaders(ReadableMap headers) {
mHeaders = headers;
} </s> remove (YGIsExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis) &&
</s> add (YGConfigIsExperimentalFeatureEnabled(config, YGExperimentalFeatureWebFlexBasis) && </s> add mMemoryImprovementEnabled = memoryImprovementEnabled;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> @Override
<mask> public void setPadding(int spacingType, float padding) {
<mask> YogaValue current = getStylePadding(spacingType);
<mask> if (current.unit != YogaUnit.PIXEL || current.value != padding) {
<mask> super.setPadding(spacingType, padding);
<mask> mPaddingChanged = true;
<mask> markUpdated();
<mask> }
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> /* package */ class FlatShadowNode extends LayoutShadowNode {
<mask>
<mask> /* package */ static final FlatShadowNode[] EMPTY_ARRAY = new FlatShadowNode[0];
<mask>
<mask> private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
<mask> private static final String PROP_OPACITY = "opacity";
<mask> private static final String PROP_RENDER_TO_HARDWARE_TEXTURE = "renderToHardwareTextureAndroid";
<mask> private static final String PROP_ACCESSIBILITY_LABEL = "accessibilityLabel";
<mask> private static final String PROP_ACCESSIBILITY_COMPONENT_TYPE = "accessibilityComponentType";
<mask> private static final String PROP_ACCESSIBILITY_LIVE_REGION = "accessibilityLiveRegion";
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> add private static final String TAG = ClippingDrawCommandManager.class.getSimpleName();
</s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> remove private StackFrame(String file, String method, int line, int column) {
</s> add private StackFrameImpl(String file, String method, int line, int column) { </s> remove public class ReactModuleInfo implements Info {
</s> add public class ReactModuleInfo {
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> /* package */ void handleUpdateProperties(ReactStylesDiffMap styles) {
<mask> if (!mountsToView()) {
<mask> // Make sure we mount this FlatShadowNode to a View if any of these properties are present.
<mask> if (styles.hasKey(PROP_DECOMPOSED_MATRIX) ||
<mask> styles.hasKey(PROP_OPACITY) ||
<mask> styles.hasKey(PROP_RENDER_TO_HARDWARE_TEXTURE) ||
<mask> styles.hasKey(PROP_TEST_ID) ||
<mask> styles.hasKey(PROP_ACCESSIBILITY_LABEL) ||
<mask> styles.hasKey(PROP_ACCESSIBILITY_COMPONENT_TYPE) ||
<mask> styles.hasKey(PROP_ACCESSIBILITY_LIVE_REGION) ||
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove if (current.unit != YogaUnit.PIXEL || current.value != padding) {
</s> add if (current.unit != YogaUnit.POINT || current.value != padding) { </s> remove if (current.unit != YogaUnit.PIXEL || current.value != padding) {
</s> add if (current.unit != YogaUnit.POINT || current.value != padding) { </s> remove if (current.unit != YogaUnit.PIXEL || current.value != padding) {
</s> add if (current.unit != YogaUnit.POINT || current.value != padding) { </s> add PerfLogging::installNativeHooks(m_context);
</s> remove PerfLogging::installNativeHooks(m_context);
</s> add </s> remove (YGNodeStyleGetFlexGrow(node) != 0 || YGNodeStyleGetFlexShrink(node) != 0));
</s> add (YGResolveFlexGrow(node) != 0 || YGNodeResolveFlexShrink(node) != 0));
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> public static FlatUIImplementation createInstance(
<mask> ReactApplicationContext reactContext,
<mask> List<ViewManager> viewManagers,
<mask> EventDispatcher eventDispatcher) {
<mask>
<mask> RCTImageViewManager rctImageViewManager = findRCTImageManager(viewManagers);
<mask> if (rctImageViewManager != null) {
<mask> Object callerContext = rctImageViewManager.getCallerContext();
<mask> if (callerContext != null) {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove return FlatUIImplementation.createInstance(reactContext, viewManagers, eventDispatcher);
</s> add return FlatUIImplementation.createInstance(
reactContext,
viewManagers,
eventDispatcher,
mMemoryImprovementEnabled); </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
</s> remove private synchronized void captureHeapHelper(File file, PerCaptureCallback callback) {
if (mHeapCapture == null) {
callback.onFailure(new CaptureException("HeapCapture.js module not connected"));
</s> add public synchronized void captureHeap(String path, final CaptureCallback callback) {
if (mCaptureInProgress != null) {
callback.onFailure(new CaptureException("Heap capture already in progress.")); </s> remove sMarkerListener.logMarker(name);
</s> add sMarkerListener.logMarker(name, tag); </s> remove static public void logMarker(String name) {
</s> add public static void logMarker(String name) {
logMarker(name, null);
}
@DoNotStrip
public static void logMarker(String name, String tag) {
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> reactContext,
<mask> rctImageViewManager,
<mask> viewManagerRegistry,
<mask> operationsQueue,
<mask> eventDispatcher
<mask> );
<mask> }
<mask>
<mask> /**
<mask> * Helper class that sorts moveTo/moveFrom arrays passed to #manageChildren().
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.devsupport.interfaces.StackFrame; </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> remove import com.facebook.react.uimanager.AppRegistry;
</s> add import com.facebook.react.modules.appregistry.AppRegistry; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.StackFrame; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep add keep keep keep keep
|
<mask> private @Nullable RCTImageViewManager mRCTImageViewManager;
<mask> private final StateBuilder mStateBuilder;
<mask>
<mask> private FlatUIImplementation(
<mask> ReactApplicationContext reactContext,
<mask> @Nullable RCTImageViewManager rctImageViewManager,
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> add private ReadableMap mHeaders; </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> add private ReadableMap mHeaders; </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> remove void onFailure(CaptureException cause);
}
private @Nullable HeapCapture mHeapCapture;
private @Nullable PerCaptureCallback mCaptureInProgress;
private static final HashSet<JSCHeapCapture> sRegisteredDumpers = new HashSet<>();
private static synchronized void registerHeapCapture(JSCHeapCapture dumper) {
if (sRegisteredDumpers.contains(dumper)) {
throw new RuntimeException(
"a JSCHeapCapture registered more than once");
}
sRegisteredDumpers.add(dumper);
</s> add void onFailure(CaptureException error);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ReactApplicationContext reactContext,
<mask> @Nullable RCTImageViewManager rctImageViewManager,
<mask> ViewManagerRegistry viewManagers,
<mask> FlatUIViewOperationQueue operationsQueue,
<mask> EventDispatcher eventDispatcher) {
<mask> super(reactContext, viewManagers, operationsQueue, eventDispatcher);
<mask> mReactContext = reactContext;
<mask> mRCTImageViewManager = rctImageViewManager;
<mask> mStateBuilder = new StateBuilder(operationsQueue);
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove return FlatUIImplementation.createInstance(reactContext, viewManagers, eventDispatcher);
</s> add return FlatUIImplementation.createInstance(
reactContext,
viewManagers,
eventDispatcher,
mMemoryImprovementEnabled); </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> add mMemoryImprovementEnabled = memoryImprovementEnabled; </s> add private final boolean mMemoryImprovementEnabled; </s> remove eventDispatcher
</s> add eventDispatcher,
memoryImprovementEnabled </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep add keep keep keep keep keep
|
<mask> mRCTImageViewManager = rctImageViewManager;
<mask> mStateBuilder = new StateBuilder(operationsQueue);
<mask> }
<mask>
<mask> @Override
<mask> protected ReactShadowNode createRootShadowNode() {
<mask> if (mRCTImageViewManager != null) {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> remove if (mCaptureInProgress != null) {
callback.onFailure(new CaptureException("Heap capture already in progress"));
</s> add File f = new File(path + "/capture.json");
f.delete();
HeapCapture heapCapture = getReactApplicationContext().getJSModule(HeapCapture.class);
if (heapCapture == null) {
callback.onFailure(new CaptureException("Heap capture js module not registered.")); </s> add if (mMemoryImprovementEnabled) {
removeRootShadowNode(rootViewTag);
} </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> remove ((ReactContext) getContext()).runOnNativeModulesQueueThread(
new Runnable() {
</s> add ReactContext reactContext = (ReactContext) getContext();
reactContext.runOnNativeModulesQueueThread(
new GuardedRunnable(reactContext) { </s> remove private synchronized void captureHeapHelper(File file, PerCaptureCallback callback) {
if (mHeapCapture == null) {
callback.onFailure(new CaptureException("HeapCapture.js module not connected"));
</s> add public synchronized void captureHeap(String path, final CaptureCallback callback) {
if (mCaptureInProgress != null) {
callback.onFailure(new CaptureException("Heap capture already in progress."));
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep add keep keep keep keep keep keep
|
<mask> @Override
<mask> public void removeRootView(int rootViewTag) {
<mask> mStateBuilder.removeRootView(rootViewTag);
<mask> }
<mask>
<mask> @Override
<mask> public void setJSResponder(int possiblyVirtualReactTag, boolean blockNativeResponder) {
<mask> ReactShadowNode node = resolveShadowNode(possiblyVirtualReactTag);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove
@Override
public void initialize() {
super.initialize();
mHeapCapture = getReactApplicationContext().getJSModule(HeapCapture.class);
registerHeapCapture(this);
}
@Override
public void onCatalystInstanceDestroy() {
super.onCatalystInstanceDestroy();
unregisterHeapCapture(this);
mHeapCapture = null;
}
</s> add </s> remove @Override
</s> add </s> remove public void isPackagerRunning(DevServerHelper.PackagerStatusCallback callback) {
</s> add public void isPackagerRunning(PackagerStatusCallback callback) { </s> remove @Override
</s> add </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
</s> add @ReactProp(name = "headers")
public void setHeaders(ReactImageView view, ReadableMap headers) {
view.setHeaders(headers);
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
|
keep add keep keep keep keep
|
<mask> */
<mask> public final class FlatUIImplementationProvider extends UIImplementationProvider {
<mask> @Override
<mask> public FlatUIImplementation createUIImplementation(
<mask> ReactApplicationContext reactContext,
<mask> List<ViewManager> viewManagers,
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove return FlatUIImplementation.createInstance(reactContext, viewManagers, eventDispatcher);
</s> add return FlatUIImplementation.createInstance(
reactContext,
viewManagers,
eventDispatcher,
mMemoryImprovementEnabled); </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> remove public static JSCHeapCapture.CaptureCallback captureCallback(final String uploadUrl) {
</s> add public static JSCHeapCapture.CaptureCallback captureCallback(
final String uploadUrl,
@Nullable final JSPackagerClient.Responder responder) { </s> add private ReadableMap mHeaders; </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> remove public class ReactModuleInfo implements Info {
</s> add public class ReactModuleInfo {
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementationProvider.java
|
keep keep keep keep replace keep keep
|
<mask> public FlatUIImplementation createUIImplementation(
<mask> ReactApplicationContext reactContext,
<mask> List<ViewManager> viewManagers,
<mask> EventDispatcher eventDispatcher) {
<mask> return FlatUIImplementation.createInstance(reactContext, viewManagers, eventDispatcher);
<mask> }
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> remove EventDispatcher eventDispatcher) {
</s> add EventDispatcher eventDispatcher,
boolean memoryImprovementEnabled) { </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
</s> add private final boolean mMemoryImprovementEnabled; </s> remove @Override
</s> add </s> remove @Override
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementationProvider.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> @Override
<mask> public void setPadding(int spacingType, float padding) {
<mask> YogaValue current = getStylePadding(spacingType);
<mask> if (current.unit != YogaUnit.PIXEL || current.value != padding) {
<mask> super.setPadding(spacingType, padding);
<mask> mPaddingChanged = true;
<mask> markUpdated();
<mask> }
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
|
replace keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> DEPS = [
<mask> react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> ]
<mask>
<mask> android_library(
<mask> name = 'jstasks',
<mask> srcs = glob(['*.java']),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'progressbar',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "progressbar",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'text',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
],
visibility = [
'PUBLIC',
],
</s> add name = "text",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
], </s> remove name = 'scroll',
srcs = glob(['*.java']),
deps = [
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
],
visibility = [
'PUBLIC',
],
</s> add name = "scroll",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/touch:touch"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
], </s> remove name = 'jstasks',
srcs = glob(['*.java']),
deps = DEPS,
visibility = [
'PUBLIC',
],
</s> add name = "jstasks",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = DEPS, </s> remove name = 'modal',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('res:modal'),
],
visibility = [
'PUBLIC',
],
</s> add name = "modal",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/touch:touch"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
react_native_target("res:modal"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
|
keep keep keep keep replace replace replace replace replace replace keep keep
|
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> ]
<mask>
<mask> android_library(
<mask> name = 'jstasks',
<mask> srcs = glob(['*.java']),
<mask> deps = DEPS,
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'switchview',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "switchview",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'swiperefresh',
srcs = glob(['*.java']),
deps = [
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/scroll:scroll'),
],
visibility = [
'PUBLIC',
],
</s> add name = "swiperefresh",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/scroll:scroll"),
], </s> remove name = 'slider',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('android_res/com/facebook/catalyst/appcompat:appcompat'),
react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "slider",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("android_res/com/facebook/catalyst/appcompat:appcompat"),
react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'progressbar',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "progressbar",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
</s> add react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/modules/appregistry:appregistry"), </s> remove name = 'text',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
],
visibility = [
'PUBLIC',
],
</s> add name = "text",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import com.facebook.infer.annotation.Assertions;
<mask> import com.facebook.react.bridge.ReactContext;
<mask> import com.facebook.react.bridge.UiThreadUtil;
<mask> import com.facebook.react.common.LifecycleState;
<mask> import com.facebook.react.uimanager.AppRegistry;
<mask>
<mask> /**
<mask> * Helper class for dealing with JS tasks. Handles per-ReactContext active task tracking, starting /
<mask> * stopping tasks and notifying listeners.
<mask> */
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.devsupport.interfaces.StackFrame; </s> remove import static com.facebook.react.common.LifecycleState.BEFORE_CREATE;
import static com.facebook.react.common.LifecycleState.BEFORE_RESUME;
import static com.facebook.react.common.LifecycleState.RESUMED;
</s> add </s> add import com.facebook.common.logging.FLog; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
import com.facebook.react.modules.debug.DeveloperSettings;
</s> add import com.facebook.react.devsupport.interfaces.DevOptionHandler;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
import com.facebook.react.devsupport.interfaces.StackFrame;
import com.facebook.react.modules.debug.interfaces.DeveloperSettings; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
|
replace keep keep replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'annotations',
<mask> srcs = glob(['**/*.java']),
<mask> deps = [
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> ],
<mask> visibility=[
<mask> 'PUBLIC'
<mask> ]
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'model',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility=[
'PUBLIC'
]
</s> add name = "model",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'picker',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "picker",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'progressbar',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "progressbar",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'text',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
],
visibility = [
'PUBLIC',
],
</s> add name = "text",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
], </s> remove react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
</s> add react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'model',
<mask> srcs = glob(['**/*.java']),
<mask> deps = [
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> ],
<mask> visibility=[
<mask> 'PUBLIC'
<mask> ]
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'annotations',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
],
visibility=[
'PUBLIC'
]
</s> add name = "annotations",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
], </s> remove name = 'logging',
srcs = glob(['**/*.java']),
exported_deps = [
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
],
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "logging",
srcs = glob(["**/*.java"]),
exported_deps = [
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'picker',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "picker",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'network',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/okhttp:okhttp3'),
],
visibility = [
'PUBLIC',
],
</s> add name = "network",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/okhttp:okhttp3"),
], </s> remove name = 'configuration',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/mockito:mockito'),
],
visibility = [
'PUBLIC',
],
</s> add name = "configuration",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/mockito:mockito"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> /**
<mask> * Data holder class holding native module specifications. {@link ReactModuleSpecProcessor} creates
<mask> * these so Java modules don't have to be instantiated at React Native start up.
<mask> */
<mask> public class ReactModuleInfo implements Info {
<mask>
<mask> private final String mName;
<mask> private final boolean mCanOverrideExistingModule;
<mask> private final boolean mSupportsWebWorkers;
<mask> private final boolean mNeedsEagerInit;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> add private final boolean mMemoryImprovementEnabled; </s> remove private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
</s> add </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
</s> add private ReadableMap mHeaders; </s> add private ReadableMap mHeaders;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
|
keep keep keep replace keep keep keep keep replace
|
<mask> mNeedsEagerInit = needsEagerInit;
<mask> }
<mask>
<mask> @Override
<mask> public String name() {
<mask> return mName;
<mask> }
<mask>
<mask> @Override
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove
@Override
public void initialize() {
super.initialize();
mHeapCapture = getReactApplicationContext().getJSModule(HeapCapture.class);
registerHeapCapture(this);
}
@Override
public void onCatalystInstanceDestroy() {
super.onCatalystInstanceDestroy();
unregisterHeapCapture(this);
mHeapCapture = null;
}
</s> add </s> remove @Override
</s> add </s> add responder.respond(response.body().string());
}
});
} </s> add if (mMemoryImprovementEnabled) {
removeRootShadowNode(rootViewTag);
} </s> add @ReactProp(name = "headers")
public void setHeaders(ReactImageView view, ReadableMap headers) {
view.setHeaders(headers);
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> public boolean canOverrideExistingModule() {
<mask> return mCanOverrideExistingModule;
<mask> }
<mask>
<mask> @Override
<mask> public boolean supportsWebWorkers() {
<mask> return mSupportsWebWorkers;
<mask> }
<mask>
<mask> @Override
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove @Override
</s> add </s> add if (mMemoryImprovementEnabled) {
removeRootShadowNode(rootViewTag);
} </s> remove public class ReactModuleInfo implements Info {
</s> add public class ReactModuleInfo { </s> add private final boolean mMemoryImprovementEnabled;
public FlatUIImplementationProvider() {
mMemoryImprovementEnabled = true;
}
public FlatUIImplementationProvider(boolean memoryImprovementEnabled) {
mMemoryImprovementEnabled = memoryImprovementEnabled;
}
</s> remove
@Override
public void initialize() {
super.initialize();
mHeapCapture = getReactApplicationContext().getJSModule(HeapCapture.class);
registerHeapCapture(this);
}
@Override
public void onCatalystInstanceDestroy() {
super.onCatalystInstanceDestroy();
unregisterHeapCapture(this);
mHeapCapture = null;
}
</s> add </s> remove @Override
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
|
replace keep keep replace keep keep keep keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> IMAGE_EVENT_FILES = [
<mask> 'ImageLoadEvent.java',
<mask> ]
<mask>
<mask> android_library(
<mask> name = 'imageevents',
<mask> srcs = IMAGE_EVENT_FILES,
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'imageevents',
srcs = IMAGE_EVENT_FILES,
deps = [
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/android/support-annotations:android-support-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
],
visibility = ['PUBLIC'],
</s> add name = "imageevents",
srcs = IMAGE_EVENT_FILES,
visibility = ["PUBLIC"],
deps = [
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/android/support-annotations:android-support-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
], </s> remove 'network/**/*',
</s> add "network/**/*", </s> remove '*Test.java',
</s> add "*Test.java", </s> remove name = 'model',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility=[
'PUBLIC'
]
</s> add name = "model",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'annotations',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
],
visibility=[
'PUBLIC'
]
</s> add name = "annotations",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep
|
<mask> 'ImageLoadEvent.java',
<mask> ]
<mask>
<mask> android_library(
<mask> name = 'imageevents',
<mask> srcs = IMAGE_EVENT_FILES,
<mask> deps = [
<mask> react_native_dep('third-party/android/support/v4:lib-support-v4'),
<mask> react_native_dep('third-party/android/support-annotations:android-support-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> ],
<mask> visibility = ['PUBLIC'],
<mask> )
<mask>
<mask> android_library(
<mask> name = 'image',
<mask> srcs = glob(['*.java'], excludes = IMAGE_EVENT_FILES),
<mask> exported_deps = [
<mask> ':imageevents',
<mask> ],
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
<mask> react_native_dep('third-party/android/support/v4:lib-support-v4'),
<mask> react_native_dep('third-party/android/support-annotations:android-support-annotations'),
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/imagehelper:withmultisource'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'frescosupport',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/text:text'),
],
visibility = [
'PUBLIC',
],
</s> add name = "frescosupport",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/modules/fresco:fresco"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/text:text"),
], </s> remove name = 'scroll',
srcs = glob(['*.java']),
deps = [
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/view:view'),
],
visibility = [
'PUBLIC',
],
</s> add name = "scroll",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/touch:touch"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
], </s> remove name = 'progressbar',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "progressbar",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'flat',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('libraries/textlayoutbuilder:textlayoutbuilder'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/modules/i18nmanager:i18nmanager'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/art:art'),
react_native_target('java/com/facebook/react/views/image:image'),
react_native_target('java/com/facebook/react/views/imagehelper:withmultisource'),
react_native_target('java/com/facebook/react/views/modal:modal'),
react_native_target('java/com/facebook/react/views/text:text'),
react_native_target('java/com/facebook/react/views/textinput:textinput'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('java/com/facebook/react/views/viewpager:viewpager'),
],
visibility = [
'PUBLIC',
],
</s> add name = "flat",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
react_native_dep("libraries/textlayoutbuilder:textlayoutbuilder"),
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
react_native_target("java/com/facebook/react/touch:touch"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/art:art"),
react_native_target("java/com/facebook/react/views/image:image"),
react_native_target("java/com/facebook/react/views/imagehelper:withmultisource"),
react_native_target("java/com/facebook/react/views/modal:modal"),
react_native_target("java/com/facebook/react/views/text:text"),
react_native_target("java/com/facebook/react/views/textinput:textinput"),
react_native_target("java/com/facebook/react/views/view:view"),
react_native_target("java/com/facebook/react/views/viewpager:viewpager"),
], </s> remove name = 'swiperefresh',
srcs = glob(['*.java']),
deps = [
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/scroll:scroll'),
],
visibility = [
'PUBLIC',
],
</s> add name = "swiperefresh",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/scroll:scroll"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
|
keep keep add keep keep keep keep keep keep
|
<mask> import com.facebook.drawee.controller.AbstractDraweeControllerBuilder;
<mask> import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
<mask> import com.facebook.react.bridge.ReadableArray;
<mask> import com.facebook.react.common.MapBuilder;
<mask> import com.facebook.react.module.annotations.ReactModule;
<mask> import com.facebook.react.uimanager.PixelUtil;
<mask> import com.facebook.react.uimanager.SimpleViewManager;
<mask> import com.facebook.react.uimanager.ThemedReactContext;
<mask> import com.facebook.react.uimanager.ViewProps;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.modules.fresco.ReactNetworkImageRequest; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.StackFrame; </s> add import com.facebook.react.modules.appstate.AppStateModule;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
|
keep keep add keep keep keep keep keep keep
|
<mask> view.setShouldNotifyLoadEvents(shouldNotifyLoadEvents);
<mask> }
<mask>
<mask> @Override
<mask> public @Nullable Map getExportedCustomDirectEventTypeConstants() {
<mask> return MapBuilder.of(
<mask> ImageLoadEvent.eventNameForType(ImageLoadEvent.ON_LOAD_START),
<mask> MapBuilder.of("registrationName", "onLoadStart"),
<mask> ImageLoadEvent.eventNameForType(ImageLoadEvent.ON_LOAD),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove public void isPackagerRunning(DevServerHelper.PackagerStatusCallback callback) {
</s> add public void isPackagerRunning(PackagerStatusCallback callback) { </s> remove @Override
</s> add </s> remove @Override
</s> add </s> remove
@Override
public void initialize() {
super.initialize();
mHeapCapture = getReactApplicationContext().getJSModule(HeapCapture.class);
registerHeapCapture(this);
}
@Override
public void onCatalystInstanceDestroy() {
super.onCatalystInstanceDestroy();
unregisterHeapCapture(this);
mHeapCapture = null;
}
</s> add </s> remove public static JSCHeapCapture.CaptureCallback captureCallback(final String uploadUrl) {
</s> add public static JSCHeapCapture.CaptureCallback captureCallback(
final String uploadUrl,
@Nullable final JSPackagerClient.Responder responder) { </s> remove @Override
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
|
keep keep add keep keep keep keep keep
|
<mask> import com.facebook.react.bridge.ReadableArray;
<mask> import com.facebook.react.bridge.ReadableMap;
<mask> import com.facebook.react.uimanager.FloatUtil;
<mask> import com.facebook.react.uimanager.PixelUtil;
<mask> import com.facebook.react.uimanager.UIManagerModule;
<mask> import com.facebook.react.uimanager.events.EventDispatcher;
<mask> import com.facebook.react.views.imagehelper.ImageSource;
<mask> import com.facebook.react.views.imagehelper.MultiSourceHelper;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> remove import com.facebook.react.uimanager.ReactChoreographer;
import com.facebook.react.uimanager.UIImplementation;
</s> add import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer; </s> remove import com.facebook.react.uimanager.ReactChoreographer;
</s> add import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
|
keep keep keep add keep keep keep keep keep
|
<mask> private @Nullable ControllerListener mControllerForTesting;
<mask> private final @Nullable Object mCallerContext;
<mask> private int mFadeDurationMs = -1;
<mask> private boolean mProgressiveRenderingEnabled;
<mask>
<mask> // We can't specify rounding in XML, so have to do so here
<mask> private static GenericDraweeHierarchy buildHierarchy(Context context) {
<mask> return new GenericDraweeHierarchyBuilder(context.getResources())
<mask> .setRoundingParams(RoundingParams.fromCornersRadius(0))
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private ReadableMap mHeaders; </s> add private final boolean mMemoryImprovementEnabled; </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> remove public class ReactModuleInfo implements Info {
</s> add public class ReactModuleInfo { </s> remove void onFailure(CaptureException cause);
}
private @Nullable HeapCapture mHeapCapture;
private @Nullable PerCaptureCallback mCaptureInProgress;
private static final HashSet<JSCHeapCapture> sRegisteredDumpers = new HashSet<>();
private static synchronized void registerHeapCapture(JSCHeapCapture dumper) {
if (sRegisteredDumpers.contains(dumper)) {
throw new RuntimeException(
"a JSCHeapCapture registered more than once");
}
sRegisteredDumpers.add(dumper);
</s> add void onFailure(CaptureException error);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
|
keep add keep keep keep keep keep
|
<mask> computedCorners[3] = mBorderCornerRadii != null && !YogaConstants.isUndefined(mBorderCornerRadii[3]) ? mBorderCornerRadii[3] : defaultBorderRadius;
<mask> }
<mask>
<mask> public void maybeUpdateView() {
<mask> if (!mIsDirty) {
<mask> return;
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove private synchronized void captureHeapHelper(File file, PerCaptureCallback callback) {
if (mHeapCapture == null) {
callback.onFailure(new CaptureException("HeapCapture.js module not connected"));
</s> add public synchronized void captureHeap(String path, final CaptureCallback callback) {
if (mCaptureInProgress != null) {
callback.onFailure(new CaptureException("Heap capture already in progress.")); </s> remove mHeapCapture.captureHeap(file.getPath());
</s> add heapCapture.captureHeap(f.getPath()); </s> remove childHeight = updatedMainSize + marginColumn;
childHeightMeasureMode = YGMeasureModeExactly;
if (!YGFloatIsUndefined(availableInnerCrossDim) &&
!YGNodeIsStyleDimDefined(currentRelativeChild, YGFlexDirectionRow) &&
widthMeasureMode == YGMeasureModeExactly &&
YGNodeAlignItem(node, currentRelativeChild) == YGAlignStretch) {
childWidth = availableInnerCrossDim;
childWidthMeasureMode = YGMeasureModeExactly;
} else if (!YGNodeIsStyleDimDefined(currentRelativeChild, YGFlexDirectionRow)) {
childWidth = availableInnerCrossDim;
childWidthMeasureMode =
YGFloatIsUndefined(childWidth) ? YGMeasureModeUndefined : YGMeasureModeAtMost;
} else {
childWidth = YGValueResolve(¤tRelativeChild->style.dimensions[YGDimensionWidth],
availableInnerWidth) +
marginRow;
childWidthMeasureMode = YGMeasureModeExactly;
}
</s> add childCrossSize = YGValueResolve(currentRelativeChild->resolvedDimensions[dim[crossAxis]],
availableInnerCrossDim) +
marginCross;
const bool isLoosePercentageMeasurement =
currentRelativeChild->resolvedDimensions[dim[crossAxis]]->unit == YGUnitPercent &&
measureModeCrossDim != YGMeasureModeExactly;
childCrossMeasureMode = YGFloatIsUndefined(childCrossSize) || isLoosePercentageMeasurement
? YGMeasureModeUndefined
: YGMeasureModeExactly; </s> remove YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPixel; \
</s> add YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPoint; \ </s> remove public Map<String, Map<String,Double>> getAllPerformanceCounters() {
Map<String, Map<String,Double>> totalPerfMap =
new HashMap<>();
if (mCatalystInstance != null) {
for (NativeModule nativeModule : mCatalystInstance.getNativeModules()) {
if (nativeModule instanceof PerformanceCounter) {
PerformanceCounter perfCounterModule = (PerformanceCounter) nativeModule;
totalPerfMap.put(nativeModule.getName(), perfCounterModule.getPerformanceCounters());
}
}
}
return totalPerfMap;
}
</s> add </s> remove node->style.instanceName[edge].unit != YGUnitPixel) { \
</s> add node->style.instanceName[edge].unit != YGUnitPoint) { \
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
|
keep keep keep keep replace keep keep keep replace replace keep keep keep keep
|
<mask> Postprocessor postprocessor = usePostprocessorScaling ? mRoundedCornerPostprocessor : null;
<mask>
<mask> ResizeOptions resizeOptions = doResize ? new ResizeOptions(getWidth(), getHeight()) : null;
<mask>
<mask> ImageRequest imageRequest = ImageRequestBuilder.newBuilderWithSource(mImageSource.getUri())
<mask> .setPostprocessor(postprocessor)
<mask> .setResizeOptions(resizeOptions)
<mask> .setAutoRotateEnabled(true)
<mask> .setProgressiveRenderingEnabled(mProgressiveRenderingEnabled)
<mask> .build();
<mask>
<mask> // This builder is reused
<mask> mDraweeControllerBuilder.reset();
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove const YGMeasureMode measureModeMainDim = isMainAxisRow ? widthMeasureMode : heightMeasureMode;
const YGMeasureMode measureModeCrossDim = isMainAxisRow ? heightMeasureMode : widthMeasureMode;
</s> add YGMeasureMode measureModeMainDim = isMainAxisRow ? widthMeasureMode : heightMeasureMode;
YGMeasureMode measureModeCrossDim = isMainAxisRow ? heightMeasureMode : widthMeasureMode; </s> add const float childWidth = isMainAxisRow ? childMainSize : childCrossSize;
const float childHeight = !isMainAxisRow ? childMainSize : childCrossSize;
const YGMeasureMode childWidthMeasureMode =
isMainAxisRow ? childMainMeasureMode : childCrossMeasureMode;
const YGMeasureMode childHeightMeasureMode =
!isMainAxisRow ? childMainMeasureMode : childCrossMeasureMode;
</s> remove childHeightMeasureMode =
</s> add const YGMeasureMode childHeightMeasureMode = </s> remove if (!isCrossSizeDefinite) {
childWidthMeasureMode =
</s> add if (!YGNodeIsStyleDimDefined(child, crossAxis, availableInnerCrossDim)) {
float childMainSize = child->layout.measuredDimensions[dim[mainAxis]];
float childCrossSize =
!YGFloatIsUndefined(child->style.aspectRatio)
? ((YGNodeMarginForAxis(child, crossAxis, availableInnerWidth) +
(isMainAxisRow ? childMainSize / child->style.aspectRatio
: childMainSize * child->style.aspectRatio)))
: crossDim;
childMainSize += YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
YGMeasureMode childMainMeasureMode = YGMeasureModeExactly;
YGMeasureMode childCrossMeasureMode = YGMeasureModeExactly;
YGConstrainMaxSizeForMode(YGValueResolve(&child->style.maxDimensions[dim[mainAxis]],
availableInnerMainDim),
&childMainMeasureMode,
&childMainSize);
YGConstrainMaxSizeForMode(YGValueResolve(&child->style.maxDimensions[dim[crossAxis]],
availableInnerCrossDim),
&childCrossMeasureMode,
&childCrossSize);
const float childWidth = isMainAxisRow ? childMainSize : childCrossSize;
const float childHeight = !isMainAxisRow ? childMainSize : childCrossSize;
const YGMeasureMode childWidthMeasureMode = </s> add // We want to make sure our available height does not violate min and max constraints
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
|
replace keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'imagehelper',
<mask> srcs = glob(['*.java'], excludes=['MultiSourceHelper.java']),
<mask> deps = [
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
<mask> android_library(
<mask> name = 'withmultisource',
<mask> srcs = ['MultiSourceHelper.java'],
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'withmultisource',
srcs = ['MultiSourceHelper.java'],
exported_deps = [
':imagehelper',
],
deps = [
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "withmultisource",
srcs = ["MultiSourceHelper.java"],
exported_deps = [
":imagehelper",
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'picker',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "picker",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'logging',
srcs = glob(['**/*.java']),
exported_deps = [
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
],
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "logging",
srcs = glob(["**/*.java"]),
exported_deps = [
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'progressbar',
srcs = glob(['*.java']),
deps = [
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "progressbar",
srcs = glob(["*.java"]),
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
], </s> remove name = 'annotations',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
],
visibility=[
'PUBLIC'
]
</s> add name = "annotations",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> ],
<mask> )
<mask>
<mask> android_library(
<mask> name = 'withmultisource',
<mask> srcs = ['MultiSourceHelper.java'],
<mask> exported_deps = [
<mask> ':imagehelper',
<mask> ],
<mask> deps = [
<mask> react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'imagehelper',
srcs = glob(['*.java'], excludes=['MultiSourceHelper.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "imagehelper",
srcs = glob(
["*.java"],
excludes = ["MultiSourceHelper.java"],
),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'logging',
srcs = glob(['**/*.java']),
exported_deps = [
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
],
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "logging",
srcs = glob(["**/*.java"]),
exported_deps = [
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'bridge',
srcs = glob(['**/*.java']),
exported_deps = [
react_native_dep('java/com/facebook/jni:jni'),
react_native_dep('java/com/facebook/proguard/annotations:annotations'),
react_native_dep('third-party/java/jsr-330:jsr-330'),
],
deps = [
react_native_dep('java/com/facebook/systrace:systrace'),
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/common:common'),
],
visibility = [
'PUBLIC',
],
</s> add name = "bridge",
srcs = glob(["**/*.java"]),
exported_deps = [
react_native_dep("java/com/facebook/jni:jni"),
react_native_dep("java/com/facebook/proguard/annotations:annotations"),
react_native_dep("third-party/java/jsr-330:jsr-330"),
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("java/com/facebook/systrace:systrace"),
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/common:common"),
], </s> remove name = 'common',
srcs = glob(['**/*.java'], excludes=SUB_PROJECTS),
exported_deps = [
react_native_dep('java/com/facebook/proguard/annotations:annotations'),
],
deps = [
':build_config',
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "common",
srcs = glob(
["**/*.java"],
excludes = SUB_PROJECTS,
),
exported_deps = [
react_native_dep("java/com/facebook/proguard/annotations:annotations"),
],
visibility = [
"PUBLIC",
],
deps = [
":build_config",
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
], </s> remove name = 'image',
srcs = glob(['*.java'], excludes = IMAGE_EVENT_FILES),
exported_deps = [
':imageevents',
],
deps = [
YOGA_TARGET,
react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/android/support-annotations:android-support-annotations'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/imagehelper:withmultisource'),
],
visibility = [
'PUBLIC',
],
</s> add name = "image",
srcs = glob(
["*.java"],
excludes = IMAGE_EVENT_FILES,
),
exported_deps = [
":imageevents",
],
visibility = [
"PUBLIC",
],
deps = [
YOGA_TARGET,
react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"),
react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
react_native_dep("third-party/android/support/v4:lib-support-v4"),
react_native_dep("third-party/android/support-annotations:android-support-annotations"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/modules/fresco:fresco"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/imagehelper:withmultisource"),
], </s> remove name = 'picker',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
</s> add name = "picker",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'modal',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/touch:touch'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/view:view'),
<mask> react_native_target('res:modal'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
|
keep keep add keep keep keep keep keep
|
<mask>
<mask> import com.facebook.infer.annotation.Assertions;
<mask> import com.facebook.react.R;
<mask> import com.facebook.react.bridge.LifecycleEventListener;
<mask> import com.facebook.react.bridge.ReactContext;
<mask> import com.facebook.react.common.annotations.VisibleForTesting;
<mask> import com.facebook.react.uimanager.JSTouchDispatcher;
<mask> import com.facebook.react.uimanager.RootView;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.StackFrame; </s> remove import android.view.Choreographer;
</s> add </s> add import android.graphics.drawable.LayerDrawable; </s> remove import com.facebook.react.uimanager.AppRegistry;
</s> add import com.facebook.react.modules.appregistry.AppRegistry; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
import com.facebook.react.modules.debug.DeveloperSettings;
</s> add import com.facebook.react.devsupport.interfaces.DevOptionHandler;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
import com.facebook.react.devsupport.interfaces.StackFrame;
import com.facebook.react.modules.debug.interfaces.DeveloperSettings; </s> add import com.facebook.common.logging.FLog;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
|
keep replace replace keep replace keep keep keep keep
|
<mask> if (getChildCount() > 0) {
<mask> ((ReactContext) getContext()).runOnNativeModulesQueueThread(
<mask> new Runnable() {
<mask> @Override
<mask> public void run() {
<mask> ((ReactContext) getContext()).getNativeModule(UIManagerModule.class)
<mask> .updateNodeSize(getChildAt(0).getId(), w, h);
<mask> }
<mask> });
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove listener.onHostResume();
</s> add try {
listener.onHostResume();
} catch (RuntimeException e) {
handleException(e);
} </s> remove new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
return new JavaOnlyArray();
}
});
</s> add new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
return new JavaOnlyArray();
}
}); </s> remove PowerMockito.when(ReactChoreographer.getInstance()).thenReturn(choreographerMock);
</s> add PowerMockito.when(ReactChoreographer.getInstance()).thenReturn(uiDriverMock); </s> remove mPendingChoreographerCallbacks = new ArrayList<>();
</s> add mPendingFrameCallbacks = new ArrayList<>(); </s> remove mPendingChoreographerCallbacks = new ArrayList<>();
</s> add mPendingFrameCallbacks = new ArrayList<>();
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'picker',
<mask> srcs = glob(['**/*.java']),
<mask> deps = [
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'progressbar',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'scroll',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> react_native_dep('third-party/android/support/v4:lib-support-v4'),
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/touch:touch'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/view:view'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
|
keep keep keep add keep keep keep keep keep keep
|
<mask> import android.graphics.Color;
<mask> import android.graphics.Rect;
<mask> import android.graphics.drawable.ColorDrawable;
<mask> import android.graphics.drawable.Drawable;
<mask> import android.view.MotionEvent;
<mask> import android.view.View;
<mask> import android.widget.HorizontalScrollView;
<mask>
<mask> import com.facebook.infer.annotation.Assertions;
<mask> import com.facebook.react.uimanager.MeasureSpecAssertions;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import android.graphics.drawable.LayerDrawable; </s> remove import android.view.Choreographer;
</s> add </s> add import com.facebook.common.logging.FLog; </s> add import java.util.Arrays; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.StackFrame; </s> add import com.facebook.react.bridge.GuardedRunnable;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
|
keep keep keep add keep keep keep keep keep
|
<mask> import com.facebook.react.uimanager.MeasureSpecAssertions;
<mask> import com.facebook.react.uimanager.events.NativeGestureUtil;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroup;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
<mask>
<mask> /**
<mask> * Similar to {@link ReactScrollView} but only supports horizontal scrolling.
<mask> */
<mask> public class ReactHorizontalScrollView extends HorizontalScrollView implements
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.common.logging.FLog; </s> remove import static com.facebook.react.common.LifecycleState.BEFORE_CREATE;
import static com.facebook.react.common.LifecycleState.BEFORE_RESUME;
import static com.facebook.react.common.LifecycleState.RESUMED;
</s> add </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.devsupport.interfaces.StackFrame;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
|
keep keep keep add keep keep keep keep keep keep
|
<mask> private @Nullable FpsListener mFpsListener = null;
<mask> private @Nullable String mScrollPerfTag;
<mask> private @Nullable Drawable mEndBackground;
<mask> private int mEndFillColor = Color.TRANSPARENT;
<mask>
<mask> public ReactHorizontalScrollView(Context context) {
<mask> this(context, null);
<mask> }
<mask>
<mask> public ReactHorizontalScrollView(Context context, @Nullable FpsListener fpsListener) {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> remove @Nullable static private MarkerListener sMarkerListener = null;
</s> add private static @Nullable MarkerListener sMarkerListener = null; </s> add private ReadableMap mHeaders; </s> add private ReadableMap mHeaders;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
|
keep keep add keep keep keep keep
|
<mask>
<mask> import com.facebook.react.bridge.ReadableArray;
<mask> import com.facebook.react.module.annotations.ReactModule;
<mask> import com.facebook.react.uimanager.annotations.ReactProp;
<mask> import com.facebook.react.uimanager.ThemedReactContext;
<mask> import com.facebook.react.uimanager.ViewGroupManager;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.modules.appstate.AppStateModule; </s> add import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
|
keep add keep keep keep keep keep keep
|
<mask> import com.facebook.react.uimanager.ViewGroupManager;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
<mask>
<mask> /**
<mask> * View manager for {@link ReactHorizontalScrollView} components.
<mask> *
<mask> * <p>Note that {@link ReactScrollView} and {@link ReactHorizontalScrollView} are exposed to JS
<mask> * as a single ScrollView component, configured via the {@code horizontal} boolean property.
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> add import com.facebook.common.logging.FLog; </s> remove import static com.facebook.react.common.LifecycleState.BEFORE_CREATE;
import static com.facebook.react.common.LifecycleState.BEFORE_RESUME;
import static com.facebook.react.common.LifecycleState.RESUMED;
</s> add </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.StackFrame;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
|
keep keep add keep keep keep keep
|
<mask>
<mask> protected static final String REACT_CLASS = "AndroidHorizontalScrollView";
<mask>
<mask> private @Nullable FpsListener mFpsListener = null;
<mask>
<mask> public ReactHorizontalScrollViewManager() {
<mask> this(null);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> remove private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
</s> add </s> remove @Nullable static private MarkerListener sMarkerListener = null;
</s> add private static @Nullable MarkerListener sMarkerListener = null; </s> remove void logMarker(String name);
</s> add void logMarker(String name, @Nullable String tag); </s> add private ReadableMap mHeaders;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
|
keep keep add keep keep keep keep keep keep
|
<mask> import android.graphics.Rect;
<mask> import android.graphics.drawable.ColorDrawable;
<mask> import android.graphics.drawable.Drawable;
<mask> import android.util.Log;
<mask> import android.view.MotionEvent;
<mask> import android.view.View;
<mask> import android.view.ViewGroup;
<mask> import android.widget.OverScroller;
<mask> import android.widget.ScrollView;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import android.graphics.drawable.LayerDrawable; </s> remove import android.view.Choreographer;
</s> add </s> remove import java.util.List;
</s> add import java.util.concurrent.TimeUnit;
import com.facebook.react.packagerconnection.JSPackagerClient;
</s> add import java.util.Arrays; </s> add import javax.annotation.Nullable;
</s> add import com.facebook.common.logging.FLog;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
|
keep keep keep add keep keep keep keep keep
|
<mask> import com.facebook.react.uimanager.events.NativeGestureUtil;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroup;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
<mask> import com.facebook.infer.annotation.Assertions;
<mask>
<mask> /**
<mask> * A simple subclass of ScrollView that doesn't dispatch measure and layout to its children and has
<mask> * a scroll listener to send scroll events to JS.
<mask> *
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> add import com.facebook.common.logging.FLog; </s> add import com.facebook.react.modules.core.ChoreographerCompat; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
import com.facebook.react.modules.debug.DeveloperSettings;
</s> add import com.facebook.react.devsupport.interfaces.DevOptionHandler;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
import com.facebook.react.devsupport.interfaces.StackFrame;
import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
|
keep keep add keep keep keep keep
|
<mask> private @Nullable Drawable mEndBackground;
<mask> private int mEndFillColor = Color.TRANSPARENT;
<mask> private View mContentView;
<mask>
<mask> public ReactScrollView(ReactContext context) {
<mask> this(context, null);
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> add private ReadableMap mHeaders; </s> add private ReadableMap mHeaders; </s> remove private StackFrame(String file, String method, int line, int column) {
</s> add private StackFrameImpl(String file, String method, int line, int column) { </s> remove @Nullable static private MarkerListener sMarkerListener = null;
</s> add private static @Nullable MarkerListener sMarkerListener = null; </s> add private final boolean mMemoryImprovementEnabled;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
|
keep keep keep add keep keep keep keep keep
|
<mask>
<mask> import com.facebook.react.bridge.ReadableArray;
<mask> import com.facebook.react.common.MapBuilder;
<mask> import com.facebook.react.module.annotations.ReactModule;
<mask> import com.facebook.react.uimanager.annotations.ReactProp;
<mask> import com.facebook.react.uimanager.ThemedReactContext;
<mask> import com.facebook.react.uimanager.ViewGroupManager;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
<mask> import com.facebook.react.uimanager.annotations.ReactPropGroup;
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.bridge.ReadableMap; </s> remove import com.facebook.react.devsupport.StackTraceHelper.StackFrame;
</s> add import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.devsupport.interfaces.StackFrame; </s> add import com.facebook.react.modules.appstate.AppStateModule;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
|
keep keep keep add keep keep keep keep keep
|
<mask> import com.facebook.react.uimanager.annotations.ReactProp;
<mask> import com.facebook.react.uimanager.ThemedReactContext;
<mask> import com.facebook.react.uimanager.ViewGroupManager;
<mask> import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
<mask>
<mask> /**
<mask> * View manager for {@link ReactScrollView} components.
<mask> *
<mask> * <p>Note that {@link ReactScrollView} and {@link ReactHorizontalScrollView} are exposed to JS
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.uimanager.annotations.ReactPropGroup;
import com.facebook.yoga.YogaConstants; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable; </s> remove import static com.facebook.react.common.LifecycleState.BEFORE_CREATE;
import static com.facebook.react.common.LifecycleState.BEFORE_RESUME;
import static com.facebook.react.common.LifecycleState.RESUMED;
</s> add </s> add import com.facebook.common.logging.FLog; </s> add import com.facebook.react.devsupport.interfaces.StackFrame; </s> add import com.facebook.react.views.view.ReactViewBackgroundDrawable;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
|
keep keep add keep keep keep keep
|
<mask>
<mask> protected static final String REACT_CLASS = "RCTScrollView";
<mask>
<mask> private @Nullable FpsListener mFpsListener = null;
<mask>
<mask> public ReactScrollViewManager() {
<mask> this(null);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> remove private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
</s> add </s> remove @Nullable static private MarkerListener sMarkerListener = null;
</s> add private static @Nullable MarkerListener sMarkerListener = null; </s> remove void logMarker(String name);
</s> add void logMarker(String name, @Nullable String tag); </s> add private ReadableMap mHeaders;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'slider',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('android_res/com/facebook/catalyst/appcompat:appcompat'),
<mask> react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'swiperefresh',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> react_native_dep('third-party/android/support/v4:lib-support-v4'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/scroll:scroll'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'switchview',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'text',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/view:view'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> android_library(
<mask> name = 'frescosupport',
<mask> srcs = glob(['*.java']),
<mask> deps = [
<mask> YOGA_TARGET,
<mask> react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
<mask> react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
<mask> react_native_dep('third-party/java/infer-annotations:infer-annotations'),
<mask> react_native_dep('third-party/java/jsr-305:jsr-305'),
<mask> react_native_target('java/com/facebook/react/bridge:bridge'),
<mask> react_native_target('java/com/facebook/react/common:common'),
<mask> react_native_target('java/com/facebook/react/module/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/uimanager:uimanager'),
<mask> react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
<mask> react_native_target('java/com/facebook/react/views/text:text'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
|
keep keep keep add keep keep keep keep
|
<mask> import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
<mask> import com.facebook.react.bridge.ReadableArray;
<mask> import com.facebook.react.bridge.ReadableType;
<mask> import com.facebook.react.uimanager.ViewProps;
<mask> import com.facebook.react.uimanager.annotations.ReactProp;
<mask> import com.facebook.react.views.text.ReactTextInlineImageShadowNode;
<mask> import com.facebook.react.views.text.TextInlineImageSpan;
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add import com.facebook.react.bridge.ReadableMap; </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> add import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.Spacing;
import com.facebook.react.uimanager.ViewProps; </s> remove import com.facebook.react.uimanager.ReactChoreographer;
import com.facebook.react.uimanager.UIImplementation;
</s> add import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer; </s> remove import com.facebook.react.uimanager.ReactChoreographer;
</s> add import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer; </s> add import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
|
keep keep add keep keep keep keep keep keep
|
<mask> public class FrescoBasedReactTextInlineImageShadowNode extends ReactTextInlineImageShadowNode {
<mask>
<mask> private @Nullable Uri mUri;
<mask> private final AbstractDraweeControllerBuilder mDraweeControllerBuilder;
<mask> private final @Nullable Object mCallerContext;
<mask> private float mWidth = YogaConstants.UNDEFINED;
<mask> private float mHeight = YogaConstants.UNDEFINED;
<mask>
<mask> public FrescoBasedReactTextInlineImageShadowNode(
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add private ReadableMap mHeaders; </s> add private final boolean mMemoryImprovementEnabled; </s> add private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable; </s> remove private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
</s> add </s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
</s> add private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
};
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
|
keep keep add keep keep keep keep
|
<mask> obj->setFieldValue(paddingRightField, YGNodeLayoutGetPadding(root, YGEdgeRight));
<mask> obj->setFieldValue(paddingBottomField, YGNodeLayoutGetPadding(root, YGEdgeBottom));
<mask>
<mask> YGTransferLayoutDirection(root, obj);
<mask>
<mask> for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
<mask> YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove roundToPixelGrid(YGNodeGetChild(node, i));
</s> add YGRoundToPixelGrid(YGNodeGetChild(node, i)); </s> remove for (uint32_t i = 0; i < YGNodeGetChildCount(node); i++) {
</s> add const uint32_t childCount = YGNodeGetChildCount(node);
for (uint32_t i = 0; i < childCount; i++) { </s> remove for (uint32_t i = 0; i < YGNodeGetChildCount(node); i++) {
</s> add const uint32_t childCount = YGNodeGetChildCount(node);
for (uint32_t i = 0; i < childCount; i++) { </s> remove uint32_t startIndex = endIndex;
</s> add const uint32_t startIndex = endIndex; </s> add float totalFlexBasis = 0;
</s> remove
</s> add if (child->style.display == YGDisplayNone) {
continue;
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep add keep keep keep keep keep
|
<mask> return reinterpret_cast<YGNodeRef>(static_cast<intptr_t>(addr));
<mask> }
<mask>
<mask> void jni_YGSetLogger(alias_ref<jclass> clazz, alias_ref<jobject> logger) {
<mask> if (jLogger) {
<mask> jLogger->releaseAlias();
<mask> delete jLogger;
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove void jni_YGSetExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature, jboolean enabled) {
YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
}
jboolean jni_YGIsExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature) {
return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
}
jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
return YGNodeGetInstanceCount();
}
</s> add </s> add jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
const YGNodeRef node = YGNodeNewWithConfig(_jlong2YGConfigRef(configPointer));
YGNodeSetContext(node, new weak_ref<jobject>(make_weak(thiz)));
YGNodeSetPrintFunc(node, YGPrint);
return reinterpret_cast<jlong>(node);
}
</s> remove if (littleEndianToHost(header.BCMagic) == BCBundleMagicNumber) {
</s> add switch (littleEndianToHost(header.magic)) {
case RAMBundleMagicNumber:
return ScriptTag::RAMBundle;
case BCBundleMagicNumber: </s> remove public Map<String, Map<String,Double>> getAllPerformanceCounters() {
Map<String, Map<String,Double>> totalPerfMap =
new HashMap<>();
if (mCatalystInstance != null) {
for (NativeModule nativeModule : mCatalystInstance.getNativeModules()) {
if (nativeModule instanceof PerformanceCounter) {
PerformanceCounter perfCounterModule = (PerformanceCounter) nativeModule;
totalPerfMap.put(nativeModule.getName(), perfCounterModule.getPerformanceCounters());
}
}
}
return totalPerfMap;
}
</s> add </s> add static inline void YGResolveDimensions(YGNodeRef node) {
for (YGDimension dim = YGDimensionWidth; dim <= YGDimensionHeight; dim++) {
if (node->style.maxDimensions[dim].unit != YGUnitUndefined &&
YGValueEqual(node->style.maxDimensions[dim], node->style.minDimensions[dim])) {
node->resolvedDimensions[dim] = &node->style.maxDimensions[dim];
} else {
node->resolvedDimensions[dim] = &node->style.dimensions[dim];
}
}
}
</s> remove
return ScriptTag::String;
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> YGLog(static_cast<YGLogLevel>(level), "%s", nMessage);
<mask> Environment::current()->ReleaseStringUTFChars(message, nMessage);
<mask> }
<mask>
<mask> void jni_YGSetExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature, jboolean enabled) {
<mask> YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
<mask> }
<mask>
<mask> jboolean jni_YGIsExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature) {
<mask> return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
<mask> }
<mask>
<mask> jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
<mask> return YGNodeGetInstanceCount();
<mask> }
<mask>
<mask> jlong jni_YGNodeNew(alias_ref<jobject> thiz) {
<mask> const YGNodeRef node = YGNodeNew();
<mask> YGNodeSetContext(node, new weak_ref<jobject>(make_weak(thiz)));
<mask> YGNodeSetPrintFunc(node, YGPrint);
<mask> return reinterpret_cast<jlong>(node);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
const YGNodeRef node = YGNodeNewWithConfig(_jlong2YGConfigRef(configPointer));
YGNodeSetContext(node, new weak_ref<jobject>(make_weak(thiz)));
YGNodeSetPrintFunc(node, YGPrint);
return reinterpret_cast<jlong>(node);
}
</s> remove static bool experimentalFeatures[YGExperimentalFeatureCount + 1];
void YGSetExperimentalFeatureEnabled(YGExperimentalFeature feature, bool enabled) {
experimentalFeatures[feature] = enabled;
</s> add void YGConfigSetExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature,
const bool enabled) {
config->experimentalFeatures[feature] = enabled; </s> remove void CatalystInstanceImpl::callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments) {
</s> add void CatalystInstanceImpl::jniCallJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments) { </s> remove inline bool YGIsExperimentalFeatureEnabled(YGExperimentalFeature feature) {
return experimentalFeatures[feature];
</s> add inline bool YGConfigIsExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature) {
return config->experimentalFeatures[feature]; </s> add #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
}
</s> add static inline YGConfigRef _jlong2YGConfigRef(jlong addr) {
return reinterpret_cast<YGConfigRef>(static_cast<intptr_t>(addr));
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> void jni_YGNodeFree(alias_ref<jobject> thiz, jlong nativePointer) {
<mask> const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
<mask> delete YGNodeJobject(node);
<mask> YGNodeFree(node);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove YGUndefined,
YGUndefined,
</s> add static_cast<float>(width),
static_cast<float>(height), </s> remove void jni_YGNodeCalculateLayout(alias_ref<jobject>, jlong nativePointer) {
</s> add void jni_YGNodeCalculateLayout(alias_ref<jobject>,
jlong nativePointer,
jfloat width,
jfloat height) { </s> remove void jni_YGSetExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature, jboolean enabled) {
YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
}
jboolean jni_YGIsExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature) {
return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
}
jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
return YGNodeGetInstanceCount();
}
</s> add </s> remove const YGMeasureMode heightMeasureMode) {
</s> add const YGMeasureMode heightMeasureMode,
const float parentWidth,
const float parentHeight) { </s> add #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
}
</s> remove roundToPixelGrid(YGNodeGetChild(node, i));
</s> add YGRoundToPixelGrid(YGNodeGetChild(node, i));
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep keep replace keep keep replace replace keep keep keep
|
<mask> void jni_YGNodeRemoveChild(alias_ref<jobject>, jlong nativePointer, jlong childPointer) {
<mask> YGNodeRemoveChild(_jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer));
<mask> }
<mask>
<mask> void jni_YGNodeCalculateLayout(alias_ref<jobject>, jlong nativePointer) {
<mask> const YGNodeRef root = _jlong2YGNodeRef(nativePointer);
<mask> YGNodeCalculateLayout(root,
<mask> YGUndefined,
<mask> YGUndefined,
<mask> YGNodeStyleGetDirection(_jlong2YGNodeRef(nativePointer)));
<mask> YGTransferLayoutOutputsRecursive(root);
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
const YGNodeRef node = YGNodeNewWithConfig(_jlong2YGConfigRef(configPointer));
YGNodeSetContext(node, new weak_ref<jobject>(make_weak(thiz)));
YGNodeSetPrintFunc(node, YGPrint);
return reinterpret_cast<jlong>(node);
}
</s> add #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
}
</s> add YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display); </s> add #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer, jint edge) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)); \
}
</s> remove void jni_YGSetExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature, jboolean enabled) {
YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
}
jboolean jni_YGIsExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature) {
return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
}
jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
return YGNodeGetInstanceCount();
}
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep add keep keep keep keep keep keep
|
<mask> YGNodeStyleSet##name##Percent(_jlong2YGNodeRef(nativePointer), static_cast<float>(value)); \
<mask> }
<mask>
<mask> #define YG_NODE_JNI_STYLE_EDGE_PROP(javatype, type, name) \
<mask> javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer, jint edge) { \
<mask> return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer), \
<mask> static_cast<YGEdge>(edge)); \
<mask> } \
<mask> \
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer, jint edge) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)); \
}
</s> remove return YGComputedEdgeValue(node->style.instanceName, edge, &defaultValue)->value; \
</s> add return node->style.instanceName[edge].value; \ </s> remove YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPixel; \
</s> add YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPoint; \ </s> add #define YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO(type, name) \
WIN_EXPORT void YGNodeStyleSet##name##Auto(const YGNodeRef node, const YGEdge edge);
</s> add JSBigString.cpp \ </s> remove node->style.instanceName[edge].unit != YGUnitPixel) { \
</s> add node->style.instanceName[edge].unit != YGUnitPoint) { \
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGDirection, Direction);
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGFlexDirection, FlexDirection);
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGJustify, JustifyContent);
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGAlign, AlignItems);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display); </s> remove // pixel values then the returned value will be the same as YGNodeStyleGetXXX. However if
</s> add // point values then the returned value will be the same as YGNodeStyleGetXXX. However if </s> add case YGAlignSpaceBetween:
case YGAlignSpaceAround: </s> remove } catch (IOException e) {
showNewJavaError(e.getMessage(), e);
</s> add </s> remove m_callback->onBatchComplete();
</s> add if (m_batchHadNativeModuleCalls) {
m_callback->onBatchComplete();
m_batchHadNativeModuleCalls = false;
} </s> remove } else if (YGNodeStyleGetFlexGrow(child) > 0.0f && YGNodeStyleGetFlexShrink(child) > 0.0f) {
</s> add } else if (YGResolveFlexGrow(child) > 0.0f && YGNodeResolveFlexShrink(child) > 0.0f) {
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep add keep keep keep keep keep keep
|
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGWrap, FlexWrap);
<mask> YG_NODE_JNI_STYLE_PROP(jint, YGOverflow, Overflow);
<mask>
<mask> void jni_YGNodeStyleSetFlex(alias_ref<jobject>, jlong nativePointer, jfloat value) {
<mask> YGNodeStyleSetFlex(_jlong2YGNodeRef(nativePointer), static_cast<float>(value));
<mask> }
<mask> YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexGrow);
<mask> YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexShrink);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove YG_NODE_JNI_STYLE_UNIT_PROP(FlexBasis);
</s> add YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(FlexBasis); </s> remove YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Margin);
</s> add YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(Margin); </s> add #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer, jint edge) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)); \
}
</s> remove void jni_YGNodeCalculateLayout(alias_ref<jobject>, jlong nativePointer) {
</s> add void jni_YGNodeCalculateLayout(alias_ref<jobject>,
jlong nativePointer,
jfloat width,
jfloat height) { </s> remove YG_NODE_JNI_STYLE_UNIT_PROP(Height);
</s> add YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Height); </s> add #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep replace keep keep replace keep keep keep keep
|
<mask> }
<mask> YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexGrow);
<mask> YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexShrink);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(FlexBasis);
<mask>
<mask> YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Position);
<mask> YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Margin);
<mask> YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Padding);
<mask> YG_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Border);
<mask>
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(Width);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove YG_NODE_JNI_STYLE_UNIT_PROP(Width);
</s> add YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Width); </s> add YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display); </s> remove YG_NODE_JNI_STYLE_UNIT_PROP(Height);
</s> add YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Height); </s> remove // pixel values then the returned value will be the same as YGNodeStyleGetXXX. However if
</s> add // point values then the returned value will be the same as YGNodeStyleGetXXX. However if </s> add case YGAlignSpaceBetween:
case YGAlignSpaceAround:
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep replace keep keep replace keep keep keep keep
|
<mask> YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Padding);
<mask> YG_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Border);
<mask>
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(Width);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(MinWidth);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(MaxWidth);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(Height);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(MinHeight);
<mask> YG_NODE_JNI_STYLE_UNIT_PROP(MaxHeight);
<mask>
<mask> // Yoga specific properties, not compatible with flexbox specification
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Margin);
</s> add YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(Margin); </s> remove YG_NODE_JNI_STYLE_UNIT_PROP(FlexBasis);
</s> add YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(FlexBasis); </s> remove // * The 'wrap' property supports only 'nowrap' (which is the default) or
// 'wrap'. The
// rarely-used 'wrap-reverse' is not supported.
// * Rather than allowing arbitrary combinations of flexGrow, flexShrink and
// flexBasis, this algorithm supports only the three most common
// combinations:
// flex: 0 is equiavlent to flex: 0 0 auto
// flex: n (where n is a positive value) is equivalent to flex: n 1 auto
// If POSITIVE_FLEX_IS_AUTO is 0, then it is equivalent to flex: n 0 0
// This is faster because the content doesn't need to be measured, but
// it's
// less flexible because the basis is always 0 and can't be overriden
// with
// the width/height attributes.
// flex: -1 (or any negative value) is equivalent to flex: 0 1 auto
// * Margins cannot be specified as 'auto'. They must be specified in terms of
// pixel
// values, and the default value is 0.
// * Values of width, maxWidth, minWidth, height, maxHeight and minHeight must
// be
// specified as pixel values, not as percentages.
// * There is no support for calculation of dimensions based on intrinsic
// aspect ratios
// (e.g. images).
</s> add </s> add YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display); </s> add // We want to make sure our available width does not violate min and max constraints
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep add keep keep keep keep keep
|
<mask> registerNatives("com/facebook/yoga/YogaNode",
<mask> {
<mask> YGMakeNativeMethod(jni_YGNodeNew),
<mask> YGMakeNativeMethod(jni_YGNodeFree),
<mask> YGMakeNativeMethod(jni_YGNodeReset),
<mask> YGMakeNativeMethod(jni_YGNodeInsertChild),
<mask> YGMakeNativeMethod(jni_YGNodeRemoveChild),
<mask> YGMakeNativeMethod(jni_YGNodeCalculateLayout),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove return getMQRegistry().find(tid);
</s> add return getMQRegistry().find(tid).lock();
}
std::function<void()> CxxMessageQueue::getUnregisteredRunLoop() {
return [capture=qr_] {
capture->bindToThisThread();
capture->run();
}; </s> remove
</s> add if (child->style.display == YGDisplayNone) {
continue;
} </s> remove #include "ExecutorToken.h"
</s> add </s> add #include <cxxreact/ExecutorToken.h> </s> remove public void run() {
</s> add public void runGuarded() { </s> remove if (YGIsExperimentalFeatureEnabled(YGExperimentalFeatureRounding)) {
roundToPixelGrid(node);
</s> add if (YGConfigIsExperimentalFeatureEnabled(node->config, YGExperimentalFeatureRounding)) {
YGRoundToPixelGrid(node);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep add keep keep keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetOverflow),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetOverflow),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlex),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetFlexGrow),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlexGrow),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetFlexShrink),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlexShrink),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasisAuto), </s> remove name = 'tagsoup-remote-jar',
url = 'mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2',
sha1 = '639fd364750d7363c85797dc944b4a80f78fa684',
</s> add name = "tagsoup-remote-jar",
sha1 = "639fd364750d7363c85797dc944b4a80f78fa684",
url = "mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2", </s> remove name = 'download-powermock-api-support',
url = 'mvn:org.powermock:powermock-api-support:jar:1.6.2',
sha1 = '93b21413b4ee99b7bc0dd34e1416fdca96866aaf',
</s> add name = "download-powermock-api-support",
sha1 = "93b21413b4ee99b7bc0dd34e1416fdca96866aaf",
url = "mvn:org.powermock:powermock-api-support:jar:1.6.2", </s> remove name = 'download-powermock-api-mockito',
url = 'mvn:org.powermock:powermock-api-mockito:jar:1.6.2',
sha1 = 'c213230ae20a7b422f3d622a261d0e3427d2464c',
</s> add name = "download-powermock-api-mockito",
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-core',
url = 'mvn:org.powermock:powermock-core:jar:1.6.2',
sha1 = 'ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c',
</s> add name = "download-powermock-core",
sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c",
url = "mvn:org.powermock:powermock-core:jar:1.6.2",
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep add keep keep keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlexShrink),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetFlexBasis),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasis),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasisPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetMargin),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMargin),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMarginPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMarginAuto),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetPadding),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YGMakeNativeMethod(jni_YGNodeStyleSetMarginAuto), </s> add YGMakeNativeMethod(jni_YGNodeStyleGetDisplay),
YGMakeNativeMethod(jni_YGNodeStyleSetDisplay), </s> remove name = 'tagsoup-jar',
src = ':tagsoup-remote-jar',
out = 'tagsoup-1.2.jar', # name defines filename used by robolectric in runtime
</s> add name = "tagsoup-jar",
src = ":tagsoup-remote-jar",
out = "tagsoup-1.2.jar", # name defines filename used by robolectric in runtime </s> remove name = 'powermock-api-support',
binary_jar = ':download-powermock-api-support',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-support",
binary_jar = ":download-powermock-api-support",
visibility = ["//ReactAndroid/..."], </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-core',
url = 'mvn:org.powermock:powermock-core:jar:1.6.2',
sha1 = 'ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c',
</s> add name = "download-powermock-core",
sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c",
url = "mvn:org.powermock:powermock-core:jar:1.6.2",
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep add keep keep keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetMargin),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMargin),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMarginPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetPadding),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetPadding),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetPaddingPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetBorder),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetBorder),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasisAuto), </s> remove name = 'powermock',
</s> add name = "powermock", </s> remove name = 'powermock-api-support',
binary_jar = ':download-powermock-api-support',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-support",
binary_jar = ":download-powermock-api-support",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-api-mockito',
url = 'mvn:org.powermock:powermock-api-mockito:jar:1.6.2',
sha1 = 'c213230ae20a7b422f3d622a261d0e3427d2464c',
</s> add name = "download-powermock-api-mockito",
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-core',
url = 'mvn:org.powermock:powermock-core:jar:1.6.2',
sha1 = 'ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c',
</s> add name = "download-powermock-core",
sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c",
url = "mvn:org.powermock:powermock-core:jar:1.6.2",
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep add keep keep keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetWidth),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetWidth),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetWidthPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetHeight),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetHeight),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetHeightPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetHeightAuto),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetMinWidth),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YGMakeNativeMethod(jni_YGNodeStyleSetHeightAuto), </s> remove WIN_EXPORT void YGSetExperimentalFeatureEnabled(YGExperimentalFeature feature, bool enabled);
WIN_EXPORT bool YGIsExperimentalFeatureEnabled(YGExperimentalFeature feature);
</s> add // Set this to number of pixels in 1 point to round calculation results
// If you want to avoid rounding - set PointScaleFactor to 0
WIN_EXPORT void YGSetPointScaleFactor(float pixelsInPoint);
// YGConfig
WIN_EXPORT YGConfigRef YGConfigNew(void);
WIN_EXPORT void YGConfigFree(const YGConfigRef config);
WIN_EXPORT void YGConfigSetExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature,
const bool enabled);
WIN_EXPORT bool YGConfigIsExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature); </s> remove name = 'powermock',
</s> add name = "powermock", </s> remove name = 'powermock-api-support',
binary_jar = ':download-powermock-api-support',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-support",
binary_jar = ":download-powermock-api-support",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-api-mockito',
url = 'mvn:org.powermock:powermock-api-mockito:jar:1.6.2',
sha1 = 'c213230ae20a7b422f3d622a261d0e3427d2464c',
</s> add name = "download-powermock-api-mockito",
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep add keep keep keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetHeight),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetHeightPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetMinWidth),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMinWidth),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMinWidthPercent),
<mask> YGMakeNativeMethod(jni_YGNodeStyleGetMinHeight),
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetMinHeight),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add YGMakeNativeMethod(jni_YGNodeStyleSetWidthAuto), </s> remove WIN_EXPORT void YGSetExperimentalFeatureEnabled(YGExperimentalFeature feature, bool enabled);
WIN_EXPORT bool YGIsExperimentalFeatureEnabled(YGExperimentalFeature feature);
</s> add // Set this to number of pixels in 1 point to round calculation results
// If you want to avoid rounding - set PointScaleFactor to 0
WIN_EXPORT void YGSetPointScaleFactor(float pixelsInPoint);
// YGConfig
WIN_EXPORT YGConfigRef YGConfigNew(void);
WIN_EXPORT void YGConfigFree(const YGConfigRef config);
WIN_EXPORT void YGConfigSetExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature,
const bool enabled);
WIN_EXPORT bool YGConfigIsExperimentalFeatureEnabled(const YGConfigRef config,
const YGExperimentalFeature feature); </s> remove name = 'powermock',
</s> add name = "powermock", </s> remove name = 'powermock-api-support',
binary_jar = ':download-powermock-api-support',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-support",
binary_jar = ":download-powermock-api-support",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-api-mockito',
url = 'mvn:org.powermock:powermock-api-mockito:jar:1.6.2',
sha1 = 'c213230ae20a7b422f3d622a261d0e3427d2464c',
</s> add name = "download-powermock-api-mockito",
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
keep keep keep keep replace replace keep keep keep
|
<mask> YGMakeNativeMethod(jni_YGNodeStyleSetAspectRatio),
<mask> YGMakeNativeMethod(jni_YGNodeGetInstanceCount),
<mask> YGMakeNativeMethod(jni_YGSetLogger),
<mask> YGMakeNativeMethod(jni_YGLog),
<mask> YGMakeNativeMethod(jni_YGSetExperimentalFeatureEnabled),
<mask> YGMakeNativeMethod(jni_YGIsExperimentalFeatureEnabled),
<mask> });
<mask> });
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
return new JavaOnlyArray();
}
});
</s> add new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
return new JavaOnlyArray();
}
}); </s> add responder.respond(response.body().string());
}
});
} </s> remove std::runtime_error(folly::to<std::string>("Error invoking callback.", callbackId)));
</s> add std::runtime_error(folly::to<std::string>("Error invoking callback ", callbackId))); </s> remove m_callback->onBatchComplete();
</s> add if (m_batchHadNativeModuleCalls) {
m_callback->onBatchComplete();
m_batchHadNativeModuleCalls = false;
} </s> remove mPendingChoreographerCallbacks = new ArrayList<>();
</s> add mPendingFrameCallbacks = new ArrayList<>(); </s> remove mPendingChoreographerCallbacks = new ArrayList<>();
</s> add mPendingFrameCallbacks = new ArrayList<>();
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
|
replace keep keep keep keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> # Temp workaround to get the build working e2e, Gradle builds them for us
<mask>
<mask> prebuilt_native_library(
<mask> name = 'reactnative-libs',
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'reactnative-libs',
native_libs = 'lib',
visibility = ['PUBLIC'],
</s> add name = "reactnative-libs",
native_libs = "lib",
visibility = ["PUBLIC"], </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS")
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/prebuilt/BUCK
|
keep replace replace replace keep keep keep keep replace replace replace keep
|
<mask> prebuilt_native_library(
<mask> name = 'reactnative-libs',
<mask> native_libs = 'lib',
<mask> visibility = ['PUBLIC'],
<mask> )
<mask>
<mask>
<mask> android_prebuilt_aar(
<mask> name = 'android-jsc',
<mask> aar = ':android-jsc-aar',
<mask> visibility = ['PUBLIC'],
<mask> )
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'soloader',
aar = ':soloader-binary-aar',
visibility = ['PUBLIC'],
</s> add name = "soloader",
aar = ":soloader-binary-aar",
visibility = ["PUBLIC"], </s> remove name = 'soloader-binary-aar',
url = 'mvn:com.facebook.soloader:soloader:aar:0.1.0',
sha1 = '918573465c94c6bc9bad48ef259f1e0cd6543c1b',
</s> add name = "soloader-binary-aar",
sha1 = "918573465c94c6bc9bad48ef259f1e0cd6543c1b",
url = "mvn:com.facebook.soloader:soloader:aar:0.1.0", </s> remove name = 'android-jsc-aar',
url = 'mvn:org.webkit:android-jsc:aar:r174650',
sha1 = '880cedd93f43e0fc841f01f2fa185a63d9230f85',
</s> add name = "android-jsc-aar",
sha1 = "880cedd93f43e0fc841f01f2fa185a63d9230f85",
url = "mvn:org.webkit:android-jsc:aar:r174650", </s> remove name = 'textlayoutbuilder-base',
aar = ':textlayoutbuilder-base-aar',
visibility = ['//ReactAndroid/...',],
</s> add name = "textlayoutbuilder-base",
aar = ":textlayoutbuilder-base-aar",
visibility = ["//ReactAndroid/..."], </s> remove name = 'imagepipeline-base',
aar = ':imagepipeline-base-aar',
visibility = ['//ReactAndroid/...',],
</s> add name = "imagepipeline-base",
aar = ":imagepipeline-base-aar",
visibility = ["//ReactAndroid/..."],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/prebuilt/BUCK
|
keep keep keep keep replace replace replace keep
|
<mask> visibility = ['PUBLIC'],
<mask> )
<mask>
<mask> remote_file(
<mask> name = 'android-jsc-aar',
<mask> url = 'mvn:org.webkit:android-jsc:aar:r174650',
<mask> sha1 = '880cedd93f43e0fc841f01f2fa185a63d9230f85',
<mask> )
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'android-jsc',
aar = ':android-jsc-aar',
visibility = ['PUBLIC'],
</s> add name = "android-jsc",
aar = ":android-jsc-aar",
visibility = ["PUBLIC"], </s> remove name = 'soloader-binary-aar',
url = 'mvn:com.facebook.soloader:soloader:aar:0.1.0',
sha1 = '918573465c94c6bc9bad48ef259f1e0cd6543c1b',
</s> add name = "soloader-binary-aar",
sha1 = "918573465c94c6bc9bad48ef259f1e0cd6543c1b",
url = "mvn:com.facebook.soloader:soloader:aar:0.1.0", </s> remove name = 'soloader',
aar = ':soloader-binary-aar',
visibility = ['PUBLIC'],
</s> add name = "soloader",
aar = ":soloader-binary-aar",
visibility = ["PUBLIC"], </s> remove name = 'support-annotations-binary-aar',
url = 'mvn:com.android.support:support-annotations:jar:23.4.0',
sha1 = 'ffbe55fdb2bb456b1485831706a9eac3300bb6b8',
</s> add name = "support-annotations-binary-aar",
sha1 = "ffbe55fdb2bb456b1485831706a9eac3300bb6b8",
url = "mvn:com.android.support:support-annotations:jar:23.4.0", </s> remove name = 'download-xpp3',
url = 'mvn:xpp3:xpp3_min:jar:1.1.4c',
sha1 = '19d4e90b43059058f6e056f794f0ea4030d60b86',
</s> add name = "download-xpp3",
sha1 = "19d4e90b43059058f6e056f794f0ea4030d60b86",
url = "mvn:xpp3:xpp3_min:jar:1.1.4c", </s> remove name = 'imagepipeline-okhttp3-binary-aar',
url = 'mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:0.11.0',
sha1 = '3d7e6d1a2f2e973a596aae7d523667b5a3d6d8a5',
</s> add name = "imagepipeline-okhttp3-binary-aar",
sha1 = "361e123fd114481ee037199db21337f06994f36e",
url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.0.1",
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/prebuilt/BUCK
|
replace keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> # TODO(cjhopman): Remove this target (or move the xreact target to this directory).
<mask> cxx_library(
<mask> name='jni',
<mask> soname = 'libreactnativejni.$(ext)',
<mask> header_namespace = 'react/jni',
<mask> srcs = [
<mask> 'Dummy.cpp',
<mask> ],
<mask> deps = [
<mask> react_native_target('jni/xreact/jni:jni'),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'samplemodule',
soname = 'libxplat_react_module_samplemodule.so',
srcs = ['SampleCxxModule.cpp'],
xcode_public_headers_symlinks = True,
exported_headers = ['SampleCxxModule.h'],
header_namespace = '',
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
'-fno-omit-frame-pointer',
'-Wall',
'-Werror',
'-std=c++1y',
'-fexceptions',
],
deps = [
':module',
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "samplemodule",
srcs = ["SampleCxxModule.cpp"],
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
"-fno-omit-frame-pointer",
"-Wall",
"-Werror",
"-std=c++1y",
"-fexceptions",
],
exported_headers = ["SampleCxxModule.h"],
header_namespace = "",
soname = "libxplat_react_module_samplemodule.so",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
":module",
"//xplat/folly:molly",
], </s> remove name = 'module',
force_static = True,
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
xcode_public_headers_symlinks = True,
exported_headers = [
'CxxModule.h',
'JsArgumentHelpers.h',
'JsArgumentHelpers-inl.h',
],
header_namespace = 'cxxreact',
deps = [
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "module",
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
exported_headers = [
"CxxModule.h",
"JsArgumentHelpers.h",
"JsArgumentHelpers-inl.h",
],
force_static = True,
header_namespace = "cxxreact",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
"//xplat/folly:molly",
], </s> remove name = 'perftests',
srcs = [ 'OnLoad.cpp' ],
soname = 'libnativereactperftests.$(ext)',
compiler_flags = [
'-fexceptions',
'-std=c++1y',
],
deps = [
'//native:base',
'//native/fb:fb',
'//xplat/folly:molly',
react_native_xplat_target('cxxreact:module'),
],
visibility = [
'//instrumentation_tests/com/facebook/react/...',
],
</s> add name = "perftests",
srcs = ["OnLoad.cpp"],
compiler_flags = [
"-fexceptions",
"-std=c++1y",
],
soname = "libnativereactperftests.$(ext)",
visibility = [
"//instrumentation_tests/com/facebook/react/...",
],
deps = [
"//native:base",
"//native/fb:fb",
"//xplat/folly:molly",
react_native_xplat_target("cxxreact:module"),
], </s> remove name='jni',
soname = 'libreactnativejnifb.$(ext)',
header_namespace = 'xreact/jni',
deps = JSC_DEPS + [
'//native/fb:fb',
'//native/third-party/android-ndk:android',
'//xplat/folly:molly',
'//xplat/fbsystrace:fbsystrace',
react_native_xplat_target('cxxreact:bridge'),
react_native_xplat_target('cxxreact:module'),
react_native_xplat_target('inspector:inspector'),
],
srcs = glob(['*.cpp']),
xcode_public_headers_symlinks = True,
exported_headers = EXPORTED_HEADERS,
headers = glob(['*.h'], excludes=EXPORTED_HEADERS),
preprocessor_flags = [
'-DLOG_TAG="ReactNativeJNI"',
'-DWITH_FBSYSTRACE=1',
'-DWITH_INSPECTOR=1',
],
compiler_flags = [
'-Wall',
'-Werror',
'-fexceptions',
'-std=c++1y',
'-fvisibility=hidden',
'-frtti',
'-Wno-pessimizing-move',
'-Wno-inconsistent-missing-override',
],
visibility = [
'PUBLIC',
],
</s> add name = "jni",
srcs = glob(["*.cpp"]),
compiler_flags = [
"-Wall",
"-Werror",
"-fexceptions",
"-std=c++1y",
"-frtti",
"-Wno-pessimizing-move",
"-Wno-inconsistent-missing-override",
],
exported_headers = EXPORTED_HEADERS,
header_namespace = "xreact/jni",
headers = glob(
["*.h"],
excludes = EXPORTED_HEADERS,
),
preprocessor_flags = [
"-DLOG_TAG=\"ReactNativeJNI\"",
"-DWITH_FBSYSTRACE=1",
"-DWITH_INSPECTOR=1",
],
soname = "libreactnativejnifb.$(ext)",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = JSC_DEPS + [
"//native/fb:fb",
"//native/third-party/android-ndk:android",
"//xplat/folly:molly",
"//xplat/fbgloginit:fbgloginit",
"//xplat/fbsystrace:fbsystrace",
react_native_xplat_target("cxxreact:bridge"),
react_native_xplat_target("cxxreact:module"),
react_native_xplat_target("inspector:inspector"),
], </s> remove name = 'configuration',
srcs = glob(['**/*.java']),
deps = [
react_native_dep('third-party/java/mockito:mockito'),
],
visibility = [
'PUBLIC',
],
</s> add name = "configuration",
srcs = glob(["**/*.java"]),
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/mockito:mockito"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/react/jni/BUCK
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> # this type of implicit dependency. As it is now, we need to setup a dummy
<mask> # rules to model the Android NDK's built in libraries.
<mask>
<mask> LIBS = (
<mask> 'android',
<mask> 'EGL',
<mask> 'GLESv2',
<mask> 'jnigraphics',
<mask> 'log',
<mask> 'z',
<mask> )
<mask>
<mask> for lib in LIBS:
<mask> prebuilt_cxx_library(
<mask> name = lib,
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'pthread',
header_only = True,
exported_platform_linker_flags = [
('android', []),
('default', ['-lpthread']),
('static', ['-lpthread']),
],
visibility = [
'PUBLIC',
],
</s> add name = "pthread",
exported_platform_linker_flags = [
(
"android",
[],
),
(
"default",
["-lpthread"],
),
(
"static",
["-lpthread"],
),
],
header_only = True,
visibility = [
"PUBLIC",
], </s> remove name = 'rt',
header_only = True,
exported_platform_linker_flags = [
('android', []), # Empty, since `-lc` is implicit
('default', ['-lrt']),
],
visibility = [
'PUBLIC',
],
) </s> add </s> remove name = 'android-all-4.1.2_r1-robolectric-0', # name defines filename used by robolectric in runtime
binary_jar = ':robolectric-android-all-binary-jar',
visibility = ['//ReactAndroid/...',],
</s> add name = "android-all-4.1.2_r1-robolectric-0", # name defines filename used by robolectric in runtime
binary_jar = ":robolectric-android-all-binary-jar",
visibility = ["//ReactAndroid/..."], </s> remove name = 'robolectric-android-all-binary-jar',
src = ':robolectric-android-all-binary-remote-jar',
out = 'android-all-4.1.2_r1-robolectric-0.jar', # name defines filename used by robolectric in runtime
</s> add name = "robolectric-android-all-binary-jar",
src = ":robolectric-android-all-binary-remote-jar",
out = "android-all-4.1.2_r1-robolectric-0.jar", # name defines filename used by robolectric in runtime </s> remove name = 'appcompat',
deps = [
':res-for-appcompat',
],
visibility = [
'PUBLIC',
],
exported_deps = [
':classes-for-react-native',
],
</s> add name = "appcompat",
exported_deps = [
":classes-for-react-native",
],
visibility = [
"PUBLIC",
],
deps = [
":res-for-appcompat",
], </s> remove name = 'package_js',
main = 'package_js.py',
visibility = [
'PUBLIC',
],
</s> add name = "package_js",
main = "package_js.py",
visibility = [
"PUBLIC",
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK
|
keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace keep keep
|
<mask> # libpthread is implicitly included in the android runtime so, when building
<mask> # on an android platform, we don't do anything.
<mask> prebuilt_cxx_library(
<mask> name = 'pthread',
<mask> header_only = True,
<mask> exported_platform_linker_flags = [
<mask> ('android', []),
<mask> ('default', ['-lpthread']),
<mask> ('static', ['-lpthread']),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
<mask> prebuilt_cxx_library(
<mask> name = 'dl',
<mask> header_only = True,
<mask> exported_linker_flags = [
<mask> '-ldl',
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'rt',
header_only = True,
exported_platform_linker_flags = [
('android', []), # Empty, since `-lc` is implicit
('default', ['-lrt']),
],
visibility = [
'PUBLIC',
],
) </s> add </s> remove name = 'm',
header_only = True,
exported_linker_flags = [
'-lm',
],
visibility = [
'PUBLIC',
],
</s> add name = "m",
exported_linker_flags = [
"-lm",
],
header_only = True,
visibility = [
"PUBLIC",
], </s> remove name = 'module',
force_static = True,
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
xcode_public_headers_symlinks = True,
exported_headers = [
'CxxModule.h',
'JsArgumentHelpers.h',
'JsArgumentHelpers-inl.h',
],
header_namespace = 'cxxreact',
deps = [
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "module",
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
exported_headers = [
"CxxModule.h",
"JsArgumentHelpers.h",
"JsArgumentHelpers-inl.h",
],
force_static = True,
header_namespace = "cxxreact",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
"//xplat/folly:molly",
], </s> remove name = 'samplemodule',
soname = 'libxplat_react_module_samplemodule.so',
srcs = ['SampleCxxModule.cpp'],
xcode_public_headers_symlinks = True,
exported_headers = ['SampleCxxModule.h'],
header_namespace = '',
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
'-fno-omit-frame-pointer',
'-Wall',
'-Werror',
'-std=c++1y',
'-fexceptions',
],
deps = [
':module',
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "samplemodule",
srcs = ["SampleCxxModule.cpp"],
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
"-fno-omit-frame-pointer",
"-Wall",
"-Werror",
"-std=c++1y",
"-fexceptions",
],
exported_headers = ["SampleCxxModule.h"],
header_namespace = "",
soname = "libxplat_react_module_samplemodule.so",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
":module",
"//xplat/folly:molly",
], </s> remove name = 'appcompat',
deps = [
':res-for-appcompat',
],
visibility = [
'PUBLIC',
],
exported_deps = [
':classes-for-react-native',
],
</s> add name = "appcompat",
exported_deps = [
":classes-for-react-native",
],
visibility = [
"PUBLIC",
],
deps = [
":res-for-appcompat",
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/third-party/glibc/BUCK
|
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace replace
|
<mask> ],
<mask> )
<mask>
<mask> prebuilt_cxx_library(
<mask> name = 'm',
<mask> header_only = True,
<mask> exported_linker_flags = [
<mask> '-lm',
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
<mask> prebuilt_cxx_library(
<mask> name = 'rt',
<mask> header_only = True,
<mask> exported_platform_linker_flags = [
<mask> ('android', []), # Empty, since `-lc` is implicit
<mask> ('default', ['-lrt']),
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> ) </s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name = 'dl',
header_only = True,
exported_linker_flags = [
'-ldl',
],
visibility = [
'PUBLIC',
],
</s> add name = "dl",
exported_linker_flags = [
"-ldl",
],
header_only = True,
visibility = [
"PUBLIC",
], </s> remove name = 'pthread',
header_only = True,
exported_platform_linker_flags = [
('android', []),
('default', ['-lpthread']),
('static', ['-lpthread']),
],
visibility = [
'PUBLIC',
],
</s> add name = "pthread",
exported_platform_linker_flags = [
(
"android",
[],
),
(
"default",
["-lpthread"],
),
(
"static",
["-lpthread"],
),
],
header_only = True,
visibility = [
"PUBLIC",
], </s> remove name = 'module',
force_static = True,
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
xcode_public_headers_symlinks = True,
exported_headers = [
'CxxModule.h',
'JsArgumentHelpers.h',
'JsArgumentHelpers-inl.h',
],
header_namespace = 'cxxreact',
deps = [
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "module",
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
exported_headers = [
"CxxModule.h",
"JsArgumentHelpers.h",
"JsArgumentHelpers-inl.h",
],
force_static = True,
header_namespace = "cxxreact",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
"//xplat/folly:molly",
], </s> remove name = 'samplemodule',
soname = 'libxplat_react_module_samplemodule.so',
srcs = ['SampleCxxModule.cpp'],
xcode_public_headers_symlinks = True,
exported_headers = ['SampleCxxModule.h'],
header_namespace = '',
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
'-fno-omit-frame-pointer',
'-Wall',
'-Werror',
'-std=c++1y',
'-fexceptions',
],
deps = [
':module',
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "samplemodule",
srcs = ["SampleCxxModule.cpp"],
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
"-fno-omit-frame-pointer",
"-Wall",
"-Werror",
"-std=c++1y",
"-fexceptions",
],
exported_headers = ["SampleCxxModule.h"],
header_namespace = "",
soname = "libxplat_react_module_samplemodule.so",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
":module",
"//xplat/folly:molly",
], </s> remove name = 'withmultisource',
srcs = ['MultiSourceHelper.java'],
exported_deps = [
':imagehelper',
],
deps = [
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "withmultisource",
srcs = ["MultiSourceHelper.java"],
exported_deps = [
":imagehelper",
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/third-party/glibc/BUCK
|
replace keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> include_defs('//ReactAndroid/DEFS')
<mask>
<mask> EXPORTED_HEADERS = [
<mask> 'CxxModuleWrapper.h',
<mask> 'JSLoader.h',
<mask> 'NativeArray.h',
<mask> 'NativeCommon.h',
<mask> 'NativeMap.h',
<mask> 'ReadableNativeArray.h',
<mask> 'ReadableNativeMap.h',
<mask> 'WritableNativeArray.h',
<mask> 'WritableNativeMap.h',
<mask> ]
<mask>
<mask> cxx_library(
<mask> name='jni',
<mask> soname = 'libreactnativejnifb.$(ext)',
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove name='jni',
soname = 'libreactnativejnifb.$(ext)',
header_namespace = 'xreact/jni',
deps = JSC_DEPS + [
'//native/fb:fb',
'//native/third-party/android-ndk:android',
'//xplat/folly:molly',
'//xplat/fbsystrace:fbsystrace',
react_native_xplat_target('cxxreact:bridge'),
react_native_xplat_target('cxxreact:module'),
react_native_xplat_target('inspector:inspector'),
],
srcs = glob(['*.cpp']),
xcode_public_headers_symlinks = True,
exported_headers = EXPORTED_HEADERS,
headers = glob(['*.h'], excludes=EXPORTED_HEADERS),
preprocessor_flags = [
'-DLOG_TAG="ReactNativeJNI"',
'-DWITH_FBSYSTRACE=1',
'-DWITH_INSPECTOR=1',
],
compiler_flags = [
'-Wall',
'-Werror',
'-fexceptions',
'-std=c++1y',
'-fvisibility=hidden',
'-frtti',
'-Wno-pessimizing-move',
'-Wno-inconsistent-missing-override',
],
visibility = [
'PUBLIC',
],
</s> add name = "jni",
srcs = glob(["*.cpp"]),
compiler_flags = [
"-Wall",
"-Werror",
"-fexceptions",
"-std=c++1y",
"-frtti",
"-Wno-pessimizing-move",
"-Wno-inconsistent-missing-override",
],
exported_headers = EXPORTED_HEADERS,
header_namespace = "xreact/jni",
headers = glob(
["*.h"],
excludes = EXPORTED_HEADERS,
),
preprocessor_flags = [
"-DLOG_TAG=\"ReactNativeJNI\"",
"-DWITH_FBSYSTRACE=1",
"-DWITH_INSPECTOR=1",
],
soname = "libreactnativejnifb.$(ext)",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = JSC_DEPS + [
"//native/fb:fb",
"//native/third-party/android-ndk:android",
"//xplat/folly:molly",
"//xplat/fbgloginit:fbgloginit",
"//xplat/fbsystrace:fbsystrace",
react_native_xplat_target("cxxreact:bridge"),
react_native_xplat_target("cxxreact:module"),
react_native_xplat_target("inspector:inspector"),
], </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove name='jni',
soname = 'libreactnativejni.$(ext)',
header_namespace = 'react/jni',
srcs = [
'Dummy.cpp',
],
deps = [
react_native_target('jni/xreact/jni:jni'),
],
visibility = [
'PUBLIC',
],
</s> add name = "jni",
srcs = [
"Dummy.cpp",
],
header_namespace = "react/jni",
soname = "libreactnativejni.$(ext)",
visibility = [
"PUBLIC",
],
deps = [
react_native_target("jni/xreact/jni:jni"),
], </s> remove include_defs('//ReactAndroid/DEFS')
</s> add include_defs("//ReactAndroid/DEFS") </s> remove name = 'perftests',
srcs = [ 'OnLoad.cpp' ],
soname = 'libnativereactperftests.$(ext)',
compiler_flags = [
'-fexceptions',
'-std=c++1y',
],
deps = [
'//native:base',
'//native/fb:fb',
'//xplat/folly:molly',
react_native_xplat_target('cxxreact:module'),
],
visibility = [
'//instrumentation_tests/com/facebook/react/...',
],
</s> add name = "perftests",
srcs = ["OnLoad.cpp"],
compiler_flags = [
"-fexceptions",
"-std=c++1y",
],
soname = "libnativereactperftests.$(ext)",
visibility = [
"//instrumentation_tests/com/facebook/react/...",
],
deps = [
"//native:base",
"//native/fb:fb",
"//xplat/folly:molly",
react_native_xplat_target("cxxreact:module"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/BUCK
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask> 'WritableNativeMap.h',
<mask> ]
<mask>
<mask> cxx_library(
<mask> name='jni',
<mask> soname = 'libreactnativejnifb.$(ext)',
<mask> header_namespace = 'xreact/jni',
<mask> deps = JSC_DEPS + [
<mask> '//native/fb:fb',
<mask> '//native/third-party/android-ndk:android',
<mask> '//xplat/folly:molly',
<mask> '//xplat/fbsystrace:fbsystrace',
<mask> react_native_xplat_target('cxxreact:bridge'),
<mask> react_native_xplat_target('cxxreact:module'),
<mask> react_native_xplat_target('inspector:inspector'),
<mask> ],
<mask> srcs = glob(['*.cpp']),
<mask> xcode_public_headers_symlinks = True,
<mask> exported_headers = EXPORTED_HEADERS,
<mask> headers = glob(['*.h'], excludes=EXPORTED_HEADERS),
<mask> preprocessor_flags = [
<mask> '-DLOG_TAG="ReactNativeJNI"',
<mask> '-DWITH_FBSYSTRACE=1',
<mask> '-DWITH_INSPECTOR=1',
<mask> ],
<mask> compiler_flags = [
<mask> '-Wall',
<mask> '-Werror',
<mask> '-fexceptions',
<mask> '-std=c++1y',
<mask> '-fvisibility=hidden',
<mask> '-frtti',
<mask> '-Wno-pessimizing-move',
<mask> '-Wno-inconsistent-missing-override',
<mask> ],
<mask> visibility = [
<mask> 'PUBLIC',
<mask> ],
<mask> )
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove header_namespace = 'cxxreact',
force_static = True,
srcs = glob(['*.cpp'], excludes=['SampleCxxModule.cpp']),
headers = glob(['*.h'], excludes=CXXREACT_PUBLIC_HEADERS),
xcode_public_headers_symlinks = True,
exported_headers = CXXREACT_PUBLIC_HEADERS,
preprocessor_flags = [
'-DLOG_TAG="ReactNative"',
'-DWITH_FBSYSTRACE=1',
],
compiler_flags = [
'-Wall',
'-fexceptions',
'-fvisibility=hidden',
'-frtti',
'-std=c++1y',
] + REACT_LIBRARY_EXTRA_COMPILER_FLAGS,
deps = [
':module',
'//xplat/fbsystrace:fbsystrace',
react_native_xplat_target('jschelpers:jschelpers'),
react_native_xplat_target('microprofiler:microprofiler'),
],
</s> add srcs = glob(
["*.cpp"],
excludes = ["SampleCxxModule.cpp"],
),
compiler_flags = [
"-Wall",
"-fexceptions",
"-frtti",
"-std=c++1y",
] + REACT_LIBRARY_EXTRA_COMPILER_FLAGS,
exported_headers = CXXREACT_PUBLIC_HEADERS,
force_static = True,
header_namespace = "cxxreact",
headers = glob(
["*.h"],
excludes = CXXREACT_PUBLIC_HEADERS,
),
preprocessor_flags = [
"-DLOG_TAG=\"ReactNative\"",
"-DWITH_FBSYSTRACE=1",
],
xcode_public_headers_symlinks = True,
deps = [
":module",
"//xplat/fbsystrace:fbsystrace",
react_native_xplat_target("jschelpers:jschelpers"),
react_native_xplat_target("microprofiler:microprofiler"),
], </s> remove name = 'samplemodule',
soname = 'libxplat_react_module_samplemodule.so',
srcs = ['SampleCxxModule.cpp'],
xcode_public_headers_symlinks = True,
exported_headers = ['SampleCxxModule.h'],
header_namespace = '',
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
'-fno-omit-frame-pointer',
'-Wall',
'-Werror',
'-std=c++1y',
'-fexceptions',
],
deps = [
':module',
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "samplemodule",
srcs = ["SampleCxxModule.cpp"],
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
"-fno-omit-frame-pointer",
"-Wall",
"-Werror",
"-std=c++1y",
"-fexceptions",
],
exported_headers = ["SampleCxxModule.h"],
header_namespace = "",
soname = "libxplat_react_module_samplemodule.so",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
":module",
"//xplat/folly:molly",
], </s> remove name = 'module',
force_static = True,
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
xcode_public_headers_symlinks = True,
exported_headers = [
'CxxModule.h',
'JsArgumentHelpers.h',
'JsArgumentHelpers-inl.h',
],
header_namespace = 'cxxreact',
deps = [
'//xplat/folly:molly',
],
visibility = [
'PUBLIC',
],
</s> add name = "module",
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
exported_headers = [
"CxxModule.h",
"JsArgumentHelpers.h",
"JsArgumentHelpers-inl.h",
],
force_static = True,
header_namespace = "cxxreact",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = [
"//xplat/folly:molly",
], </s> remove name = 'perftests',
srcs = [ 'OnLoad.cpp' ],
soname = 'libnativereactperftests.$(ext)',
compiler_flags = [
'-fexceptions',
'-std=c++1y',
],
deps = [
'//native:base',
'//native/fb:fb',
'//xplat/folly:molly',
react_native_xplat_target('cxxreact:module'),
],
visibility = [
'//instrumentation_tests/com/facebook/react/...',
],
</s> add name = "perftests",
srcs = ["OnLoad.cpp"],
compiler_flags = [
"-fexceptions",
"-std=c++1y",
],
soname = "libnativereactperftests.$(ext)",
visibility = [
"//instrumentation_tests/com/facebook/react/...",
],
deps = [
"//native:base",
"//native/fb:fb",
"//xplat/folly:molly",
react_native_xplat_target("cxxreact:module"),
], </s> remove name='jni',
soname = 'libreactnativejni.$(ext)',
header_namespace = 'react/jni',
srcs = [
'Dummy.cpp',
],
deps = [
react_native_target('jni/xreact/jni:jni'),
],
visibility = [
'PUBLIC',
],
</s> add name = "jni",
srcs = [
"Dummy.cpp",
],
header_namespace = "react/jni",
soname = "libreactnativejni.$(ext)",
visibility = [
"PUBLIC",
],
deps = [
react_native_target("jni/xreact/jni:jni"),
], </s> remove name = 'logging',
srcs = glob(['**/*.java']),
exported_deps = [
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
],
deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
],
visibility = [
'PUBLIC',
],
</s> add name = "logging",
srcs = glob(["**/*.java"]),
exported_deps = [
react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
],
visibility = [
"PUBLIC",
],
deps = [
react_native_dep("third-party/java/jsr-305:jsr-305"),
],
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/BUCK
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> makeNativeMethod("initializeBridge", CatalystInstanceImpl::initializeBridge),
<mask> makeNativeMethod("jniSetSourceURL", CatalystInstanceImpl::jniSetSourceURL),
<mask> makeNativeMethod("jniLoadScriptFromAssets", CatalystInstanceImpl::jniLoadScriptFromAssets),
<mask> makeNativeMethod("jniLoadScriptFromFile", CatalystInstanceImpl::jniLoadScriptFromFile),
<mask> makeNativeMethod("jniLoadScriptFromOptimizedBundle",
<mask> CatalystInstanceImpl::jniLoadScriptFromOptimizedBundle),
<mask> makeNativeMethod("callJSFunction", CatalystInstanceImpl::callJSFunction),
<mask> makeNativeMethod("callJSCallback", CatalystInstanceImpl::callJSCallback),
<mask> makeNativeMethod("getMainExecutorToken", CatalystInstanceImpl::getMainExecutorToken),
<mask> makeNativeMethod("setGlobalVariable", CatalystInstanceImpl::setGlobalVariable),
<mask> makeNativeMethod("getJavaScriptContext", CatalystInstanceImpl::getJavaScriptContext),
<mask> makeNativeMethod("handleMemoryPressureUiHidden", CatalystInstanceImpl::handleMemoryPressureUiHidden),
<mask> makeNativeMethod("handleMemoryPressureModerate", CatalystInstanceImpl::handleMemoryPressureModerate),
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove ':javassist',
':mockito-all',
':powermock-api-mockito',
':powermock-api-support',
':powermock-classloading-base',
':powermock-classloading-xstream',
':powermock-core',
':powermock-module-junit4-rule',
':powermock-reflect',
':xmlpull',
':xpp3',
':xstream',
</s> add ":javassist",
":mockito-all",
":powermock-api-mockito",
":powermock-api-support",
":powermock-classloading-base",
":powermock-classloading-xstream",
":powermock-core",
":powermock-module-junit4-rule",
":powermock-reflect",
":xmlpull",
":xpp3",
":xstream", </s> remove name = 'download-powermock-api-support',
url = 'mvn:org.powermock:powermock-api-support:jar:1.6.2',
sha1 = '93b21413b4ee99b7bc0dd34e1416fdca96866aaf',
</s> add name = "download-powermock-api-support",
sha1 = "93b21413b4ee99b7bc0dd34e1416fdca96866aaf",
url = "mvn:org.powermock:powermock-api-support:jar:1.6.2", </s> remove name = 'powermock-api-support',
binary_jar = ':download-powermock-api-support',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-support",
binary_jar = ":download-powermock-api-support",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-api-mockito',
url = 'mvn:org.powermock:powermock-api-mockito:jar:1.6.2',
sha1 = 'c213230ae20a7b422f3d622a261d0e3427d2464c',
</s> add name = "download-powermock-api-mockito",
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", </s> remove name = 'powermock-api-mockito',
binary_jar = ':download-powermock-api-mockito',
visibility = ['//ReactAndroid/...',],
</s> add name = "powermock-api-mockito",
binary_jar = ":download-powermock-api-mockito",
visibility = ["//ReactAndroid/..."], </s> remove name = 'download-powermock-core',
url = 'mvn:org.powermock:powermock-core:jar:1.6.2',
sha1 = 'ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c',
</s> add name = "download-powermock-core",
sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c",
url = "mvn:org.powermock:powermock-core:jar:1.6.2",
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
|
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> instance_->loadScriptFromFile(fileName, sourceURL);
<mask> }
<mask> }
<mask>
<mask> void CatalystInstanceImpl::jniLoadScriptFromOptimizedBundle(const std::string& bundlePath,
<mask> const std::string& sourceURL,
<mask> jint flags) {
<mask> return instance_->loadScriptFromOptimizedBundle(std::move(bundlePath),
<mask> std::move(sourceURL),
<mask> flags);
<mask> }
<mask>
<mask> void CatalystInstanceImpl::callJSFunction(
<mask> JExecutorToken* token, std::string module, std::string method, NativeArray* arguments) {
<mask> // We want to share the C++ code, and on iOS, modules pass module/method
<mask> // names as strings all the way through to JS, and there's no way to do
<mask> // string -> id mapping on the objc side. So on Android, we convert the
<mask> // number to a string, here which gets passed as-is to JS. There, they they
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove void jniLoadScriptFromOptimizedBundle(const std::string& bundlePath, const std::string& sourceURL, jint flags);
void callJSFunction(JExecutorToken* token, std::string module, std::string method, NativeArray* arguments);
void callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments);
</s> add void jniCallJSFunction(JExecutorToken* token, std::string module, std::string method, NativeArray* arguments);
void jniCallJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments); </s> add #include <folly/Conv.h>
#include <folly/dynamic.h>
</s> remove void loadScriptFromOptimizedBundle(std::string bundlePath, std::string sourceURL, int flags);
</s> add </s> remove // We resolve main dimension to fit minimum and maximum values
if (YGFloatIsUndefined(availableInnerMainDim)) {
</s> add // If we don't measure with exact main dimension we want to ensure we don't violate min and max
if (measureModeMainDim != YGMeasureModeExactly) { </s> remove void Instance::loadScriptFromOptimizedBundle(std::string bundlePath,
std::string sourceURL,
int flags) {
SystraceSection s("reactbridge_xplat_loadScriptFromOptimizedBundle",
"bundlePath", bundlePath);
nativeToJsBridge_->loadOptimizedApplicationScript(std::move(bundlePath),
std::move(sourceURL),
flags);
}
</s> add </s> remove void NativeToJsBridge::loadOptimizedApplicationScript(
std::string bundlePath,
std::string sourceURL,
int flags) {
runOnExecutorQueue(
m_mainExecutorToken,
[bundlePath=std::move(bundlePath),
sourceURL=std::move(sourceURL),
flags=flags]
(JSExecutor* executor) {
executor->loadApplicationScript(std::move(bundlePath), std::move(sourceURL), flags);
});
}
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> std::move(method),
<mask> arguments->consume());
<mask> }
<mask>
<mask> void CatalystInstanceImpl::callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments) {
<mask> instance_->callJSCallback(token->getExecutorToken(nullptr), callbackId, arguments->consume());
<mask> }
<mask>
<mask> local_ref<JExecutorToken::JavaPart> CatalystInstanceImpl::getMainExecutorToken() {
<mask> return JExecutorToken::extractJavaPartFromToken(instance_->getMainExecutorToken());
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove void jniLoadScriptFromOptimizedBundle(const std::string& bundlePath, const std::string& sourceURL, jint flags);
void callJSFunction(JExecutorToken* token, std::string module, std::string method, NativeArray* arguments);
void callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments);
</s> add void jniCallJSFunction(JExecutorToken* token, std::string module, std::string method, NativeArray* arguments);
void jniCallJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments); </s> remove void CatalystInstanceImpl::jniLoadScriptFromOptimizedBundle(const std::string& bundlePath,
const std::string& sourceURL,
jint flags) {
return instance_->loadScriptFromOptimizedBundle(std::move(bundlePath),
std::move(sourceURL),
flags);
}
void CatalystInstanceImpl::callJSFunction(
</s> add void CatalystInstanceImpl::jniCallJSFunction( </s> remove void jni_YGSetExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature, jboolean enabled) {
YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
}
jboolean jni_YGIsExperimentalFeatureEnabled(alias_ref<jclass> clazz, jint feature) {
return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
}
jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
return YGNodeGetInstanceCount();
}
</s> add </s> add #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
}
</s> add #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name) \
YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \
void jni_YGNodeStyleSet##name##Auto(alias_ref<jobject>, jlong nativePointer, jint edge) { \
YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)); \
}
</s> remove m_callback->onBatchComplete();
</s> add if (m_batchHadNativeModuleCalls) {
m_callback->onBatchComplete();
m_batchHadNativeModuleCalls = false;
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> void jniSetSourceURL(const std::string& sourceURL);
<mask>
<mask> void jniLoadScriptFromAssets(jni::alias_ref<JAssetManager::javaobject> assetManager, const std::string& assetURL);
<mask> void jniLoadScriptFromFile(const std::string& fileName, const std::string& sourceURL);
<mask> void jniLoadScriptFromOptimizedBundle(const std::string& bundlePath, const std::string& sourceURL, jint flags);
<mask> void callJSFunction(JExecutorToken* token, std::string module, std::string method, NativeArray* arguments);
<mask> void callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments);
<mask> local_ref<JExecutorToken::JavaPart> getMainExecutorToken();
<mask> void setGlobalVariable(std::string propName,
<mask> std::string&& jsonValue);
<mask> jlong getJavaScriptContext();
<mask> void handleMemoryPressureUiHidden();
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove void loadScriptFromOptimizedBundle(std::string bundlePath, std::string sourceURL, int flags);
</s> add </s> remove void CatalystInstanceImpl::jniLoadScriptFromOptimizedBundle(const std::string& bundlePath,
const std::string& sourceURL,
jint flags) {
return instance_->loadScriptFromOptimizedBundle(std::move(bundlePath),
std::move(sourceURL),
flags);
}
void CatalystInstanceImpl::callJSFunction(
</s> add void CatalystInstanceImpl::jniCallJSFunction( </s> remove #ifdef WITH_FBJSCEXTENSIONS
virtual void loadApplicationScript(
std::string bundlePath,
std::string sourceURL,
int flags) override;
#endif
</s> add </s> remove void CatalystInstanceImpl::callJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments) {
</s> add void CatalystInstanceImpl::jniCallJSCallback(JExecutorToken* token, jint callbackId, NativeArray* arguments) { </s> remove void Instance::loadScriptFromOptimizedBundle(std::string bundlePath,
std::string sourceURL,
int flags) {
SystraceSection s("reactbridge_xplat_loadScriptFromOptimizedBundle",
"bundlePath", bundlePath);
nativeToJsBridge_->loadOptimizedApplicationScript(std::move(bundlePath),
std::move(sourceURL),
flags);
}
</s> add </s> remove void NativeToJsBridge::loadOptimizedApplicationScript(
std::string bundlePath,
std::string sourceURL,
int flags) {
runOnExecutorQueue(
m_mainExecutorToken,
[bundlePath=std::move(bundlePath),
sourceURL=std::move(sourceURL),
flags=flags]
(JSExecutor* executor) {
executor->loadApplicationScript(std::move(bundlePath), std::move(sourceURL), flags);
});
}
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> #include <fb/fbjni.h>
<mask>
<mask> using namespace facebook::jni;
<mask>
<mask> struct _jqplProvider : _jobject {};
<mask> using jqplProvider = _jqplProvider*;
<mask>
<mask> struct _jqpl : _jobject {};
<mask> using jqpl = _jqpl*;
<mask>
<mask> namespace facebook { namespace jni {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove struct _jqpl : _jobject {};
using jqpl = _jqpl*;
namespace facebook { namespace jni {
template<>
class JObjectWrapper<jqpl> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
using JObjectWrapper<jobject>::JObjectWrapper;
</s> add struct JQuickPerformanceLogger : JavaClass<JQuickPerformanceLogger> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;"; </s> add #include <cxxreact/ExecutorToken.h> </s> remove #include "ExecutorToken.h"
</s> add </s> remove template<>
class JObjectWrapper<jqplProvider> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor =
"Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
</s> add struct JQuickPerformanceLoggerProvider : JavaClass<JQuickPerformanceLoggerProvider> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;"; </s> add namespace facebook { namespace react {
class Instance;
}}
</s> remove #include <memory>
</s> add #include <cxxreact/MessageQueueThread.h>
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep replace replace keep keep keep
|
<mask> using jqplProvider = _jqplProvider*;
<mask>
<mask> struct _jqpl : _jobject {};
<mask> using jqpl = _jqpl*;
<mask>
<mask> namespace facebook { namespace jni {
<mask>
<mask> template<>
<mask> class JObjectWrapper<jqpl> : public JObjectWrapper<jobject> {
<mask>
<mask> public:
<mask> static constexpr const char* kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
<mask>
<mask> using JObjectWrapper<jobject>::JObjectWrapper;
<mask>
<mask> void markerStart(int markerId, int instanceKey, long timestamp) {
<mask> static auto markerStartMethod =
<mask> qplClass()->getMethod<void(jint, jint, jlong)>("markerStart");
<mask> markerStartMethod(this_, markerId, instanceKey, timestamp);
<mask> }
<mask>
<mask> void markerEnd(int markerId, int instanceKey, short actionId, long timestamp) {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
markerEndMethod(this_, markerId, instanceKey, actionId, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
markerEndMethod(self(), markerId, instanceKey, actionId, timestamp);
}
void markerTag(int markerId, int instanceKey, alias_ref<jstring> tag) {
static auto markerTagMethod =
javaClassStatic()->getMethod<void(jint, jint, alias_ref<jstring>)>("markerTag");
markerTagMethod(self(), markerId, instanceKey, tag);
}
void markerAnnotate(
int markerId,
int instanceKey,
alias_ref<jstring> key,
alias_ref<jstring> value) {
static auto markerAnnotateMethod = javaClassStatic()->
getMethod<void(jint, jint, alias_ref<jstring>, alias_ref<jstring>)>("markerAnnotate");
markerAnnotateMethod(self(), markerId, instanceKey, key, value); </s> remove qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
markerNoteMethod(this_, markerId, instanceKey, actionId, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
markerNoteMethod(self(), markerId, instanceKey, actionId, timestamp); </s> remove struct _jqplProvider : _jobject {};
using jqplProvider = _jqplProvider*;
</s> add namespace facebook { namespace react { </s> remove template<>
class JObjectWrapper<jqplProvider> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor =
"Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
</s> add struct JQuickPerformanceLoggerProvider : JavaClass<JQuickPerformanceLoggerProvider> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;"; </s> remove using JQuickPerformanceLogger = JObjectWrapper<jqpl>;
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep replace replace keep keep keep keep replace replace keep
|
<mask> static auto markerEndMethod =
<mask> qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
<mask> markerEndMethod(this_, markerId, instanceKey, actionId, timestamp);
<mask> }
<mask>
<mask> void markerNote(int markerId, int instanceKey, short actionId, long timestamp) {
<mask> static auto markerNoteMethod =
<mask> qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
<mask> markerNoteMethod(this_, markerId, instanceKey, actionId, timestamp);
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove qplClass()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(this_, markerId, instanceKey, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(self(), markerId, instanceKey, timestamp); </s> remove struct _jqpl : _jobject {};
using jqpl = _jqpl*;
namespace facebook { namespace jni {
template<>
class JObjectWrapper<jqpl> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
using JObjectWrapper<jobject>::JObjectWrapper;
</s> add struct JQuickPerformanceLogger : JavaClass<JQuickPerformanceLogger> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;"; </s> remove qplClass()->getMethod<void(jint, jint)>("markerCancel");
markerCancelMethod(this_, markerId, instanceKey);
</s> add javaClassStatic()->getMethod<void(jint, jint)>("markerCancel");
markerCancelMethod(self(), markerId, instanceKey); </s> remove using JObjectWrapper<jobject>::JObjectWrapper;
static global_ref<jqpl> get() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
static global_ref<jqpl> theQpl = make_global(getQPLInstMethod(qplProviderClass().get()));
return theQpl;
}
static bool check() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
auto theQpl = getQPLInstMethod(qplProviderClass().get());
return (theQpl.get() != nullptr);
}
private:
static alias_ref<jclass> qplProviderClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
return cls;
</s> add static alias_ref<JQuickPerformanceLogger::javaobject> get() {
static auto getQPLInstMethod =
javaClassStatic()->getStaticMethod<JQuickPerformanceLogger::javaobject()>("getQPLInstance");
static auto logger = make_global(getQPLInstMethod(javaClassStatic()));
return logger; </s> remove qplClass()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(this_);
}
private:
static alias_ref<jclass> qplClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLogger");
return cls;
</s> add javaClassStatic()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(self());
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep
|
<mask> void markerCancel(int markerId, int instanceKey) {
<mask> static auto markerCancelMethod =
<mask> qplClass()->getMethod<void(jint, jint)>("markerCancel");
<mask> markerCancelMethod(this_, markerId, instanceKey);
<mask> }
<mask>
<mask> int64_t currentMonotonicTimestamp() {
<mask> static auto currentTimestampMethod =
<mask> qplClass()->getMethod<jlong()>("currentMonotonicTimestamp");
<mask> return currentTimestampMethod(this_);
<mask> }
<mask>
<mask> private:
<mask>
<mask> static alias_ref<jclass> qplClass() {
<mask> static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLogger");
<mask> return cls;
<mask> }
<mask>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
markerNoteMethod(this_, markerId, instanceKey, actionId, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
markerNoteMethod(self(), markerId, instanceKey, actionId, timestamp); </s> remove using JObjectWrapper<jobject>::JObjectWrapper;
static global_ref<jqpl> get() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
static global_ref<jqpl> theQpl = make_global(getQPLInstMethod(qplProviderClass().get()));
return theQpl;
}
static bool check() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
auto theQpl = getQPLInstMethod(qplProviderClass().get());
return (theQpl.get() != nullptr);
}
private:
static alias_ref<jclass> qplProviderClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
return cls;
</s> add static alias_ref<JQuickPerformanceLogger::javaobject> get() {
static auto getQPLInstMethod =
javaClassStatic()->getStaticMethod<JQuickPerformanceLogger::javaobject()>("getQPLInstance");
static auto logger = make_global(getQPLInstMethod(javaClassStatic()));
return logger; </s> remove qplClass()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
markerEndMethod(this_, markerId, instanceKey, actionId, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
markerEndMethod(self(), markerId, instanceKey, actionId, timestamp);
}
void markerTag(int markerId, int instanceKey, alias_ref<jstring> tag) {
static auto markerTagMethod =
javaClassStatic()->getMethod<void(jint, jint, alias_ref<jstring>)>("markerTag");
markerTagMethod(self(), markerId, instanceKey, tag);
}
void markerAnnotate(
int markerId,
int instanceKey,
alias_ref<jstring> key,
alias_ref<jstring> value) {
static auto markerAnnotateMethod = javaClassStatic()->
getMethod<void(jint, jint, alias_ref<jstring>, alias_ref<jstring>)>("markerAnnotate");
markerAnnotateMethod(self(), markerId, instanceKey, key, value); </s> remove qplClass()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(this_, markerId, instanceKey, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(self(), markerId, instanceKey, timestamp); </s> remove using JQuickPerformanceLoggerProvider = JObjectWrapper<jqplProvider>;
}}
</s> add
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep replace replace keep replace replace replace replace replace keep keep keep keep
|
<mask> }
<mask>
<mask> };
<mask> using JQuickPerformanceLogger = JObjectWrapper<jqpl>;
<mask>
<mask>
<mask> template<>
<mask> class JObjectWrapper<jqplProvider> : public JObjectWrapper<jobject> {
<mask> public:
<mask> static constexpr const char* kJavaDescriptor =
<mask> "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
<mask>
<mask> using JObjectWrapper<jobject>::JObjectWrapper;
<mask>
<mask> static global_ref<jqpl> get() {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove struct _jqpl : _jobject {};
using jqpl = _jqpl*;
namespace facebook { namespace jni {
template<>
class JObjectWrapper<jqpl> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
using JObjectWrapper<jobject>::JObjectWrapper;
</s> add struct JQuickPerformanceLogger : JavaClass<JQuickPerformanceLogger> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;"; </s> remove using JObjectWrapper<jobject>::JObjectWrapper;
static global_ref<jqpl> get() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
static global_ref<jqpl> theQpl = make_global(getQPLInstMethod(qplProviderClass().get()));
return theQpl;
}
static bool check() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
auto theQpl = getQPLInstMethod(qplProviderClass().get());
return (theQpl.get() != nullptr);
}
private:
static alias_ref<jclass> qplProviderClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
return cls;
</s> add static alias_ref<JQuickPerformanceLogger::javaobject> get() {
static auto getQPLInstMethod =
javaClassStatic()->getStaticMethod<JQuickPerformanceLogger::javaobject()>("getQPLInstance");
static auto logger = make_global(getQPLInstMethod(javaClassStatic()));
return logger; </s> remove qplClass()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(this_);
}
private:
static alias_ref<jclass> qplClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLogger");
return cls;
</s> add javaClassStatic()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(self()); </s> remove using JQuickPerformanceLoggerProvider = JObjectWrapper<jqplProvider>;
}}
</s> add </s> remove qplClass()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(this_, markerId, instanceKey, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(self(), markerId, instanceKey, timestamp);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace replace replace keep keep
|
<mask> public:
<mask> static constexpr const char* kJavaDescriptor =
<mask> "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
<mask>
<mask> using JObjectWrapper<jobject>::JObjectWrapper;
<mask>
<mask> static global_ref<jqpl> get() {
<mask> static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
<mask> static global_ref<jqpl> theQpl = make_global(getQPLInstMethod(qplProviderClass().get()));
<mask> return theQpl;
<mask> }
<mask>
<mask> static bool check() {
<mask> static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
<mask> auto theQpl = getQPLInstMethod(qplProviderClass().get());
<mask> return (theQpl.get() != nullptr);
<mask> }
<mask>
<mask> private:
<mask>
<mask> static alias_ref<jclass> qplProviderClass() {
<mask> static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
<mask> return cls;
<mask> }
<mask> };
<mask> using JQuickPerformanceLoggerProvider = JObjectWrapper<jqplProvider>;
<mask>
<mask> }}
<mask>
<mask> static bool isReady() {
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove template<>
class JObjectWrapper<jqplProvider> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor =
"Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
</s> add struct JQuickPerformanceLoggerProvider : JavaClass<JQuickPerformanceLoggerProvider> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;"; </s> remove qplClass()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(this_);
}
private:
static alias_ref<jclass> qplClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLogger");
return cls;
</s> add javaClassStatic()->getMethod<jlong()>("currentMonotonicTimestamp");
return currentTimestampMethod(self()); </s> remove using JQuickPerformanceLogger = JObjectWrapper<jqpl>;
</s> add </s> remove struct _jqpl : _jobject {};
using jqpl = _jqpl*;
namespace facebook { namespace jni {
template<>
class JObjectWrapper<jqpl> : public JObjectWrapper<jobject> {
public:
static constexpr const char* kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
using JObjectWrapper<jobject>::JObjectWrapper;
</s> add struct JQuickPerformanceLogger : JavaClass<JQuickPerformanceLogger> {
static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;"; </s> remove qplClass()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(this_, markerId, instanceKey, timestamp);
</s> add javaClassStatic()->getMethod<void(jint, jint, jlong)>("markerStart");
markerStartMethod(self(), markerId, instanceKey, timestamp);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep add keep keep keep keep
|
<mask> static bool isReady() {
<mask> static bool ready = false;
<mask> if (!ready) {
<mask> try {
<mask> findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
<mask> } catch(...) {
<mask> // Swallow this exception - we don't want to crash the app, an error is enough.
<mask> FBLOGE("Calling QPL from JS before class has been loaded in Java. Ignored.");
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove if (JQuickPerformanceLoggerProvider::check()) {
</s> add if (JQuickPerformanceLoggerProvider::get()) { </s> remove using JQuickPerformanceLoggerProvider = JObjectWrapper<jqplProvider>;
}}
</s> add </s> remove // We resolve main dimension to fit minimum and maximum values
if (YGFloatIsUndefined(availableInnerMainDim)) {
</s> add // If we don't measure with exact main dimension we want to ensure we don't violate min and max
if (measureModeMainDim != YGMeasureModeExactly) { </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> add } else if (YGConfigIsExperimentalFeatureEnabled(config, YGExperimentalFeatureMinFlexFix)) {
// TODO: this needs to be moved out of experimental feature, as this is legitimate fix
// If the measurement isn't exact, we want to use as little space as possible
availableInnerMainDim = sizeConsumedOnCurrentLine; </s> remove (YGNodeStyleGetFlexGrow(node) != 0 || YGNodeStyleGetFlexShrink(node) != 0));
</s> add (YGResolveFlexGrow(node) != 0 || YGNodeResolveFlexShrink(node) != 0));
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Swallow this exception - we don't want to crash the app, an error is enough.
<mask> FBLOGE("Calling QPL from JS before class has been loaded in Java. Ignored.");
<mask> return false;
<mask> }
<mask> if (JQuickPerformanceLoggerProvider::check()) {
<mask> ready = true;
<mask> } else {
<mask> FBLOGE("Calling QPL from JS before it has been initialized in Java. Ignored.");
<mask> return false;
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add // TODO: findClassStatic only does the lookup once. If we can't find
// QuickPerformanceLoggerProvider the first time we call this, we will always fail here. </s> remove public static class StackFrame {
</s> add public static class StackFrameImpl implements StackFrame { </s> remove // We resolve main dimension to fit minimum and maximum values
if (YGFloatIsUndefined(availableInnerMainDim)) {
</s> add // If we don't measure with exact main dimension we want to ensure we don't violate min and max
if (measureModeMainDim != YGMeasureModeExactly) { </s> add } else if (YGConfigIsExperimentalFeatureEnabled(config, YGExperimentalFeatureMinFlexFix)) {
// TODO: this needs to be moved out of experimental feature, as this is legitimate fix
// If the measurement isn't exact, we want to use as little space as possible
availableInnerMainDim = sizeConsumedOnCurrentLine; </s> add '//java/com/facebook/java2js:jni', </s> add #include <folly/Conv.h>
#include <folly/dynamic.h>
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep add keep keep keep keep keep keep
|
<mask> return true;
<mask> }
<mask>
<mask> static JSValueRef nativeQPLMarkerStart(
<mask> JSContextRef ctx,
<mask> JSObjectRef function,
<mask> JSObjectRef thisObject,
<mask> size_t argumentCount,
<mask> const JSValueRef arguments[],
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove #ifdef WITH_FBSYSTRACE
fbsystrace_begin_section(
TRACE_TAG_REACT_CXX_BRIDGE,
"JSCExecutor::loadApplicationScript-createExpectingAscii");
#endif
</s> add if (scriptTag == ScriptTag::BCBundle) {
using file_ptr = std::unique_ptr<FILE, decltype(&fclose)>;
file_ptr source(fopen(sourceURL.c_str(), "r"), fclose);
int sourceFD = fileno(source.get());
JSValueRef jsError;
JSValueRef result = JSC_JSEvaluateBytecodeBundle(m_context, NULL, sourceFD, jsSourceURL, &jsError);
if (result == nullptr) {
formatAndThrowJSException(m_context, jsError, jsSourceURL);
}
} else
#endif
{
#ifdef WITH_FBSYSTRACE
fbsystrace_begin_section(
TRACE_TAG_REACT_CXX_BRIDGE,
"JSCExecutor::loadApplicationScript-createExpectingAscii");
#endif </s> remove // JSExecutor functions sometimes take large strings, on the order of
// megabytes. Copying these can be expensive. Introducing a
// move-only, non-CopyConstructible type will let the compiler ensure
// that no copies occur. folly::MoveWrapper should be used when a
// large string needs to be curried into a std::function<>, which must
// by CopyConstructible.
class JSBigString {
public:
JSBigString() = default;
// Not copyable
JSBigString(const JSBigString&) = delete;
JSBigString& operator=(const JSBigString&) = delete;
virtual ~JSBigString() {}
virtual bool isAscii() const = 0;
virtual const char* c_str() const = 0;
virtual size_t size() const = 0;
};
// Concrete JSBigString implementation which holds a std::string
// instance.
class JSBigStdString : public JSBigString {
public:
JSBigStdString(std::string str, bool isAscii=false)
: m_isAscii(isAscii)
, m_str(std::move(str)) {}
bool isAscii() const override {
return m_isAscii;
}
const char* c_str() const override {
return m_str.c_str();
}
size_t size() const override {
return m_str.size();
}
private:
bool m_isAscii;
std::string m_str;
};
// Concrete JSBigString implementation which holds a heap-allocated
// buffer, and provides an accessor for writing to it. This can be
// used to construct a JSBigString in place, such as by reading from a
// file.
class JSBigBufferString : public facebook::react::JSBigString {
public:
JSBigBufferString(size_t size)
: m_data(new char[size + 1])
, m_size(size) {
// Guarantee nul-termination. The caller is responsible for
// filling in the rest of m_data.
m_data[m_size] = '\0';
}
~JSBigBufferString() {
delete[] m_data;
}
bool isAscii() const override {
return true;
}
const char* c_str() const override {
return m_data;
}
size_t size() const override {
return m_size;
}
char* data() {
return m_data;
}
private:
char* m_data;
size_t m_size;
};
// JSBigString interface implemented by a file-backed mmap region.
class RN_EXPORT JSBigFileString : public JSBigString {
public:
JSBigFileString(int fd, size_t size, off_t offset = 0)
: m_fd {-1}
, m_data {nullptr}
{
folly::checkUnixError(
m_fd = dup(fd),
"Could not duplicate file descriptor");
// Offsets given to mmap must be page aligend. We abstract away that
// restriction by sending a page aligned offset to mmap, and keeping track
// of the offset within the page that we must alter the mmap pointer by to
// get the final desired offset.
auto ps = getpagesize();
auto d = lldiv(offset, ps);
m_mapOff = d.quot;
m_pageOff = d.rem;
m_size = size + m_pageOff;
}
~JSBigFileString() {
if (m_data) {
munmap((void *)m_data, m_size);
}
close(m_fd);
}
bool isAscii() const override {
return true;
}
const char *c_str() const override {
if (!m_data) {
m_data = (const char *)mmap(0, m_size, PROT_READ, MAP_SHARED, m_fd, m_mapOff);
CHECK(m_data != MAP_FAILED)
<< " fd: " << m_fd
<< " size: " << m_size
<< " offset: " << m_mapOff
<< " error: " << std::strerror(errno);
}
return m_data + m_pageOff;
}
size_t size() const override {
return m_size - m_pageOff;
}
int fd() const {
return m_fd;
}
static std::unique_ptr<const JSBigFileString> fromPath(const std::string& sourceURL);
private:
int m_fd; // The file descriptor being mmaped
size_t m_size; // The size of the mmaped region
size_t m_pageOff; // The offset in the mmaped region to the data.
off_t m_mapOff; // The offset in the file to the mmaped region.
mutable const char *m_data; // Pointer to the mmaped region.
};
class JSBigOptimizedBundleString : public JSBigString {
public:
enum class Encoding {
Unknown,
Ascii,
Utf8,
Utf16,
};
JSBigOptimizedBundleString(int fd, size_t size, const uint8_t sha1[20], Encoding encoding) :
m_fd(-1),
m_size(size),
m_encoding(encoding),
m_str(nullptr)
{
folly::checkUnixError(
m_fd = dup(fd),
"Could not duplicate file descriptor");
memcpy(m_hash, sha1, 20);
}
~JSBigOptimizedBundleString() {
if (m_str) {
CHECK(munmap((void *)m_str, m_size) != -1);
}
close(m_fd);
}
bool isAscii() const override {
return m_encoding == Encoding::Ascii;
}
const char* c_str() const override {
if (!m_str) {
m_str = (const char *)mmap(0, m_size, PROT_READ, MAP_SHARED, m_fd, 0);
CHECK(m_str != MAP_FAILED);
}
return m_str;
}
size_t size() const override {
return m_size;
}
int fd() const {
return m_fd;
}
const uint8_t* hash() const {
return m_hash;
}
Encoding encoding() const {
return m_encoding;
}
static std::unique_ptr<const JSBigOptimizedBundleString> fromOptimizedBundle(const std::string& bundlePath);
private:
int m_fd;
size_t m_size;
uint8_t m_hash[20];
Encoding m_encoding;
mutable const char *m_str;
};
</s> add </s> remove for (uint32_t i = 0; i < YGNodeGetChildCount(node); i++) {
</s> add const uint32_t childCount = YGNodeGetChildCount(node);
for (uint32_t i = 0; i < childCount; i++) { </s> remove #include "Executor.h"
</s> add </s> remove using JObjectWrapper<jobject>::JObjectWrapper;
static global_ref<jqpl> get() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
static global_ref<jqpl> theQpl = make_global(getQPLInstMethod(qplProviderClass().get()));
return theQpl;
}
static bool check() {
static auto getQPLInstMethod = qplProviderClass()->getStaticMethod<jqpl()>("getQPLInstance");
auto theQpl = getQPLInstMethod(qplProviderClass().get());
return (theQpl.get() != nullptr);
}
private:
static alias_ref<jclass> qplProviderClass() {
static auto cls = findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
return cls;
</s> add static alias_ref<JQuickPerformanceLogger::javaobject> get() {
static auto getQPLInstMethod =
javaClassStatic()->getStaticMethod<JQuickPerformanceLogger::javaobject()>("getQPLInstance");
static auto logger = make_global(getQPLInstMethod(javaClassStatic()));
return logger; </s> remove return YGValueResolve(&node->style.margin[YGEdgeEnd], widthSize);
</s> add return YGValueResolveMargin(&node->style.margin[YGEdgeEnd], widthSize);
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> // Since this is monotonic time, I assume the 52 bits of mantissa are enough in the double value.
<mask> return JSValueMakeNumber(ctx, timestamp);
<mask> }
<mask>
<mask> namespace facebook {
<mask> namespace react {
<mask>
<mask> void addNativePerfLoggingHooks(JSGlobalContextRef ctx) {
<mask> installGlobalFunction(ctx, "nativeQPLMarkerStart", nativeQPLMarkerStart);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerEnd", nativeQPLMarkerEnd);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerNote", nativeQPLMarkerNote);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerCancel", nativeQPLMarkerCancel);
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add installGlobalFunction(ctx, "nativeQPLMarkerTag", nativeQPLMarkerTag);
installGlobalFunction(ctx, "nativeQPLMarkerAnnotate", nativeQPLMarkerAnnotate); </s> add namespace facebook { namespace react {
class Instance;
}}
</s> remove #include "ModuleRegistry.h"
</s> add </s> remove #include "NativeModule.h"
</s> add </s> remove #include "Executor.h"
</s> add #include <cxxreact/Executor.h> </s> add #include <cxxreact/NativeModule.h>
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep keep keep add keep keep keep keep
|
<mask>
<mask> void addNativePerfLoggingHooks(JSGlobalContextRef ctx) {
<mask> installGlobalFunction(ctx, "nativeQPLMarkerStart", nativeQPLMarkerStart);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerEnd", nativeQPLMarkerEnd);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerNote", nativeQPLMarkerNote);
<mask> installGlobalFunction(ctx, "nativeQPLMarkerCancel", nativeQPLMarkerCancel);
<mask> installGlobalFunction(ctx, "nativeQPLTimestamp", nativeQPLTimestamp);
<mask> }
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> remove namespace facebook {
namespace react {
</s> add </s> remove void onComplete(List<File> captures, List<CaptureException> failures);
}
private interface PerCaptureCallback {
</s> add </s> remove static public void logMarker(String name) {
</s> add public static void logMarker(String name) {
logMarker(name, null);
}
@DoNotStrip
public static void logMarker(String name, String tag) { </s> remove void onFailure(CaptureException cause);
}
private @Nullable HeapCapture mHeapCapture;
private @Nullable PerCaptureCallback mCaptureInProgress;
private static final HashSet<JSCHeapCapture> sRegisteredDumpers = new HashSet<>();
private static synchronized void registerHeapCapture(JSCHeapCapture dumper) {
if (sRegisteredDumpers.contains(dumper)) {
throw new RuntimeException(
"a JSCHeapCapture registered more than once");
}
sRegisteredDumpers.add(dumper);
</s> add void onFailure(CaptureException error); </s> remove public void isPackagerRunning(DevServerHelper.PackagerStatusCallback callback) {
</s> add public void isPackagerRunning(PackagerStatusCallback callback) { </s> add if (mMemoryImprovementEnabled) {
removeRootShadowNode(rootViewTag);
}
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/JSCPerfLogging.cpp
|
keep add keep keep keep keep
|
<mask> #include <folly/dynamic.h>
<mask> #include <fb/fbjni.h>
<mask> #include <fb/log.h>
<mask> #include <cxxreact/Executor.h>
<mask> #include <cxxreact/JSCExecutor.h>
<mask> #include <cxxreact/Platform.h>
</s> Update RN for Android
Ran kernel, can load React Conf experience
fbshipit-source-id: 2977793 </s> add #include <cxxreact/Executor.h>
#include <cxxreact/ExecutorToken.h>
#include <cxxreact/JSCExecutor.h>
#include <cxxreact/JSModulesUnbundle.h>
#include <cxxreact/MessageQueueThread.h>
#include <cxxreact/MethodCall.h>
#include <cxxreact/NativeModule.h> </s> remove #include <folly/json.h>
</s> add #include <cxxreact/Executor.h>
#include <cxxreact/ExecutorToken.h>
#include <cxxreact/JSCNativeModules.h> </s> remove #include <sys/mman.h>
#include <vector>
</s> add </s> remove #include <folly/dynamic.h>
</s> add #include <cxxreact/ExecutorToken.h>
#include <cxxreact/NativeModule.h> </s> remove #include <folly/Exception.h>
</s> add #include <cxxreact/JSBigString.h> </s> remove
#include "ExecutorToken.h"
#include "NativeModule.h"
</s> add #include <folly/dynamic.h>
|
https://github.com/expo/expo/commit/1d8f03248acb1f02dbe390e691ec4a15c039124a
|
android/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.