Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.66-stable]Adding patches required for running RN66 in Office apps #1023

Merged
merged 1 commit into from Feb 14, 2022

Conversation

mganandraj
Copy link

@mganandraj mganandraj commented Feb 14, 2022

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 馃憤
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 馃憤
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Patches already applied in 0.64 but weren't brought to main
New patches to bring new SO files to devmain

This change is cherry picked from main
git cherry-pick cadd8890f761d4e2e4a331a0db0d4ce2c9c91d85

Changelog

Patches already applied in 0.64 but weren't brought to main
New patches to bring new SO files to devmain

This change is cherry picked from main
git cherry-pick cadd8890f761d4e2e4a331a0db0d4ce2c9c91d85

[CATEGORY] [TYPE] - Message

@mganandraj mganandraj requested a review from alloy as a code owner Feb 14, 2022
@mganandraj mganandraj requested review from msgharpu, kelset and rasaha91 Feb 14, 2022
@pull-bot
Copy link

pull-bot commented Feb 14, 2022

Warnings
鈿狅笍

Base Branch - The base branch for this PR is something other than main. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on main first and then cherry-pick the commits into the branch for that release. The Releases Guide has more information.

Messages
馃摉

馃搵 Verify Changelog Format - A changelog entry has the following format: [CATEGORY] [TYPE] - Message.

CATEGORY may be:
  • General
  • macOS
  • iOS
  • Android
  • JavaScript
  • Internal (for changes that do not need to be called out in the release notes)

TYPE may be:

  • Added, for new features.
  • Changed, for changes in existing functionality.
  • Deprecated, for soon-to-be removed features.
  • Removed, for now removed features.
  • Fixed, for any bug fixes.
  • Security, in case of vulnerabilities.

MESSAGE may answer "what and why" on a feature level. Use this to briefly tell React Native users about notable changes.

馃摉 馃搵 Missing Test Plan - Can you add a Test Plan? To do so, add a "## Test Plan" section to your PR description. A Test Plan lets us know how these changes were tested.

Generated by 馃毇 dangerJS against 898f081

+ SoLoader.loadLibrary("yoga");
+ SoLoader.loadLibrary("folly_json");
+ SoLoader.loadLibrary("reactperfloggerjni");
+ SoLoader.loadLibrary("jsinspector");

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this need to be loaded in all scenarios? What about release builds?

Copy link
Author

@mganandraj mganandraj Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah.. these dependencies comes from OSS builds .. and they are not flavor specific .. This are lots of room for improvement in the native builds in OSS ..

LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)

-LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
+LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativejni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to extend the macro definition across multiple lines (like how we do with \ in nmake)? That way we could keep the android specific libraries on separate lines, which would help us stay in sync with any additions/removals that might happen in main or 0.66-stable. i.e. the patch shouldn't be manipulating the existing list, just adding new entries on new lines if possible

Copy link
Author

@mganandraj mganandraj Feb 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah .. good point ! Let's fix in main and cherry pick it to the stable branch ..

@mganandraj mganandraj merged commit fc720c2 into microsoft:0.66-stable Feb 14, 2022
15 of 17 checks passed
@mganandraj mganandraj deleted the DroidFixes66 branch Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants