Skip to content

Adding patch to ensure rn-tester for android builds successfully #1031

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

rasaha91
Copy link

@rasaha91 rasaha91 commented Feb 19, 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

Cherry-picks a change to enable rntester to build successfully for Android in 0.66-stable.

Changelog

[Android] [Fixed] - Ensure rn-tester for android builds successfully in 0.66-stable

Test Plan

Built via the commands in the pr pipeline for android, and then ran ./gradlew :packages:rn-tester:android:app:assemblehermesdebug which built successfully

@pull-bot
Copy link

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
📖

📋 Missing Changelog - Can you add a Changelog? To do so, add a "## Changelog" section to your PR description. 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 a5459c8

@rasaha91 rasaha91 marked this pull request as ready for review February 19, 2022 05:59
@rasaha91 rasaha91 requested a review from alloy as a code owner February 19, 2022 05:59
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_json.so
LOCAL_EXPORT_C_INCLUDES := \
- $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
+ $(THIRD_PARTY_NDK_DIR)/boost/boost_1_68_0 \

Choose a reason for hiding this comment

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

This is fine .. just thinking about alternatives .. It would have been to be able to use the BOOST_VERSION property in ndk build scripts to avoid this hard coding ..

Copy link
Author

Choose a reason for hiding this comment

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

Yes, I agree that this current method isn't great. I mostly just want it in so that anytime we do a find/replace on boost version, we catch all the places we need to update. Even updating this path to be boost/boost where the second boost directory is symlinked to the version we want might be a better approach.

@rasaha91 rasaha91 merged commit 76d768f into microsoft:0.66-stable Feb 22, 2022
@rasaha91 rasaha91 deleted the 0.66-cherry-pick-android-patch-fix branch February 22, 2022 20:44
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.

3 participants