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.

Sign up for GitHub

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

Jump to bottom

Merge remote-tracking branch 'fb/0.68-stable' into 0.68-stable #1394

Merged
merged 10 commits into from
Aug 28, 2022
Merged

Merge remote-tracking branch 'fb/0.68-stable' into 0.68-stable #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1fad3af
Update script from prepublish (deprecated) to prepack (#34198)
cortinico Jul 14, 2022
25e2cbb
[LOCAL] change ruby version for source
kelset Aug 2, 2022
ec3688f
Logging a soft error when ReactRootView has an id other than -1 inste…
Kunal-Airtel2022 Mar 28, 2022
989546f
Use monotonic clock for performance.now() (#33983)
Jun 10, 2022
4555fc7
Added additional builder method receiving arguments for using jsc or …
KunalFarmah98 Jun 23, 2022
af9225e
Let's not build reactnativeutilsjni shared library (#34345)
SparshaSaha Aug 5, 2022
d2d244c
[LOCAL] align pods version config with the rest of the repo
kelset Aug 5, 2022
36153e2
[0.68.3] Bump version numbers
Aug 8, 2022
e41f20b
Merge remote-tracking branch 'fb/0.68-stable' into 0.68-stable-refresh4
mganandraj Aug 28, 2022
42c9b89
Remove libreactutilsjni.so from nuget spec
mganandraj Aug 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ado/templates/apple-droid-node-patching.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ steps:
- task: CmdLine@2
displayName: Apply Android specific patches for Office consumption
inputs:
script: npm_config_yes=true npx @rnx-kit/patcher-rnmacos patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC JniUtils RootViewAttach --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
script: npm_config_yes=true npx @rnx-kit/patcher-rnmacos patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC RootViewAttach --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := \
libreact_render_uimanager \
libreact_utils \
libreact_config \
libreactnativeutilsjni \
libreactnativejni \
librrc_image \
librrc_root \
librrc_unimplementedview \
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall

LOCAL_SHARED_LIBRARIES = libfb libfbjni libreactnativeutilsjni libruntimeexecutor
LOCAL_SHARED_LIBRARIES = libfb libfbjni libreactnativejni libruntimeexecutor

LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni

Expand Down
60 changes: 0 additions & 60 deletions ReactAndroid/src/main/jni/react/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,8 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.


##########################
### React Native Utils ###
##########################

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

Copy link

Choose a reason for hiding this comment

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

Probably need to rebase patches

# Include . in the header search path for all source files in this module.
LOCAL_C_INCLUDES := $(LOCAL_PATH)

# Include ./../../ in the header search path for modules that depend on
# reactnativejni. This will allow external modules to require this module's
# headers using #include <react/jni/<header>.h>, assuming:
# . == jni
# ./../ == react
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..

LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture

LOCAL_LDLIBS += -landroid

# The dynamic libraries (.so files) that this module depends on.
LOCAL_SHARED_LIBRARIES := \
libfb \
libfbjni \
libfolly_json \
libglog_init \
libreact_render_runtimescheduler \
libruntimeexecutor \
libyoga

# The static libraries (.a files) that this module depends on.
LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder

# Name of this module.
#
# Other modules can depend on this one by adding libreactnativejni to their
# LOCAL_SHARED_LIBRARIES variable.
LOCAL_MODULE := reactnativeutilsjni

# Compile all local c++ files.
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

ifeq ($(APP_OPTIM),debug)
# Keep symbols by overriding the strip command invoked by ndk-build.
# Note that this will apply to all shared libraries,
# i.e. shared libraries will NOT be stripped
# even though we override it in this Android.mk
cmd-strip :=
endif

# Build the files in this directory as a shared library
include $(BUILD_SHARED_LIBRARY)





######################
### reactnativejni ###
######################
Expand Down Expand Up @@ -91,7 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
libfolly_json \
libglog_init \
libreact_render_runtimescheduler \
libreactnativeutilsjni \
libruntimeexecutor \
libyoga \
logger
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/progressbar/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := \
libreact_render_debug \
libreact_render_graphics \
libreact_render_uimanager \
libreactnativeutilsjni \
libreactnativejni \
librrc_view \
libyoga

Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/slider/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
libreact_render_imagemanager \
libreact_render_mapbuffer \
libreact_render_uimanager \
libreactnativeutilsjni \
libreactnativejni \
librrc_image \
librrc_view \
libyoga
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/switch/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := \
libreact_render_debug \
libreact_render_graphics \
libreact_render_uimanager \
libreactnativeutilsjni \
libreactnativejni \
librrc_view \
libyoga

Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/textlayoutmanager/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ LOCAL_SHARED_LIBRARIES := \
libreact_render_telemetry \
libreact_render_uimanager \
libreact_utils \
libreactnativeutilsjni \
libreactnativejni \
libyoga

LOCAL_STATIC_LIBRARIES :=
Expand Down
12 changes: 1 addition & 11 deletions android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ new file mode 100644
index 00000000000..5ea2105f8ac
--- /dev/null
+++ b/ReactAndroid/ReactAndroid.nuspec
@@ -0,0 +1,231 @@
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
Expand Down Expand Up @@ -93,11 +93,6 @@ index 00000000000..5ea2105f8ac
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_nativemodule_core.so" target="lib\droidx86"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64"/>
+
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreactnativeutilsjni.so" target="lib\droidx64"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreactnativeutilsjni.so" target="lib\droidx86"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64"/>
+
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreactperfloggerjni.so" target="lib\droidx64"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm"/>
+ <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreactperfloggerjni.so" target="lib\droidx86"/>
Expand Down Expand Up @@ -194,11 +189,6 @@ index 00000000000..5ea2105f8ac
+ <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_nativemodule_core.so" target="lib\droidx86\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64\unstripped"/>
+
+ <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreactnativeutilsjni.so" target="lib\droidx64\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreactnativeutilsjni.so" target="lib\droidx86\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64\unstripped"/>
+
+ <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreactperfloggerjni.so" target="lib\droidx64\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm\unstripped"/>
+ <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreactperfloggerjni.so" target="lib\droidx86\unstripped"/>
Expand Down
4 changes: 2 additions & 2 deletions android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- ./ReactAndroid/src/main/jni/react/jni/Android.mk 2022-01-11 17:41:29.000000000 -0800
+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/jni/react/jni/Android.mk 2022-01-12 15:04:31.000000000 -0800
@@ -129,6 +129,7 @@
@@ -87,6 +87,7 @@
$(call import-module,reactperflogger)
$(call import-module,hermes)
$(call import-module,runtimeexecutor)
+$(call import-module,v8jsi)
$(call import-module,react/renderer/runtimescheduler)
$(call import-module,react/nativemodule/core)

@@ -147,5 +148,6 @@
@@ -105,5 +106,6 @@
include $(REACT_SRC_DIR)/../hermes/reactexecutor/Android.mk
include $(REACT_SRC_DIR)/../hermes/instrumentation/Android.mk
include $(REACT_SRC_DIR)/modules/blob/jni/Android.mk
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Gemfile
source 'https://rubygems.org'

gem 'cocoapods', '= 1.11.2'
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
gem 'rexml'