forked from facebook/react-native
-
Notifications
You must be signed in to change notification settings - Fork 147
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
rasaha91
merged 1 commit into
microsoft:0.66-stable
from
rasaha91:0.66-cherry-pick-android-patch-fix
Feb 22, 2022
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
android-patches/patches/Build/ReactAndroid/Android-prebuilt.mk
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk | ||
| index 18f8c26620..1e5afe5751 100644 | ||
| --- a/ReactAndroid/Android-prebuilt.mk | ||
| +++ b/ReactAndroid/Android-prebuilt.mk | ||
| @@ -34,7 +34,7 @@ include $(CLEAR_VARS) | ||
| LOCAL_MODULE := folly_json | ||
| 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 \ | ||
| $(THIRD_PARTY_NDK_DIR)/double-conversion \ | ||
| $(THIRD_PARTY_NDK_DIR)/folly | ||
| # Note: Sync with folly/Android.mk. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 ..
There was a problem hiding this comment.
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.