diff --git a/.ado/templates/apple-droid-node-patching.yml b/.ado/templates/apple-droid-node-patching.yml index f0219d1e4c8c46..c3c3b254811c05 100644 --- a/.ado/templates/apple-droid-node-patching.yml +++ b/.ado/templates/apple-droid-node-patching.yml @@ -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 }} diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk index de7eb09207a067..8ccb5c2a0d6072 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk @@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ libreact_render_uimanager \ libreact_utils \ libreact_config \ - libreactnativeutilsjni \ + libreactnativejni \ librrc_image \ librrc_root \ librrc_unimplementedview \ diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk index 0f62278824d7ce..56a796474f3dfb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk @@ -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 diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index 3e1515aa5cd9ef..054faa19bfb841 100644 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -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) - -# 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 .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 ### ###################### @@ -91,7 +32,6 @@ LOCAL_SHARED_LIBRARIES := \ libfolly_json \ libglog_init \ libreact_render_runtimescheduler \ - libreactnativeutilsjni \ libruntimeexecutor \ libyoga \ logger diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk index d2750c677e8313..e5a8fb6e890313 100644 --- a/ReactCommon/react/renderer/components/progressbar/Android.mk +++ b/ReactCommon/react/renderer/components/progressbar/Android.mk @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := \ libreact_render_debug \ libreact_render_graphics \ libreact_render_uimanager \ - libreactnativeutilsjni \ + libreactnativejni \ librrc_view \ libyoga diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk index 95210acf3084aa..7919a68b316221 100644 --- a/ReactCommon/react/renderer/components/slider/Android.mk +++ b/ReactCommon/react/renderer/components/slider/Android.mk @@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ libreact_render_imagemanager \ libreact_render_mapbuffer \ libreact_render_uimanager \ - libreactnativeutilsjni \ + libreactnativejni \ librrc_image \ librrc_view \ libyoga diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk index b7e811d88419c0..5dfe9e966bb377 100644 --- a/ReactCommon/react/renderer/components/switch/Android.mk +++ b/ReactCommon/react/renderer/components/switch/Android.mk @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := \ libreact_render_debug \ libreact_render_graphics \ libreact_render_uimanager \ - libreactnativeutilsjni \ + libreactnativejni \ librrc_view \ libyoga diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk index fbc7bf6cdde378..1e6b951d4a878c 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk +++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk @@ -31,7 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ libreact_render_telemetry \ libreact_render_uimanager \ libreact_utils \ - libreactnativeutilsjni \ + libreactnativejni \ libyoga LOCAL_STATIC_LIBRARIES := diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec index bf64c0851b55eb..58cedfebbedfbc 100644 --- a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec +++ b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec @@ -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 @@ + + + @@ -93,11 +93,6 @@ index 00000000000..5ea2105f8ac + + + -+ -+ -+ -+ -+ + + + @@ -194,11 +189,6 @@ index 00000000000..5ea2105f8ac + + + -+ -+ -+ -+ -+ + + + diff --git a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk index b088c485618c54..160f8d945e757d 100644 --- a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -1,6 +1,6 @@ --- ./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) @@ -8,7 +8,7 @@ $(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 diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index cefffcd9c8bdca..7c4f5b666796fa 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -1,5 +1,5 @@ # Gemfile source 'https://rubygems.org' -gem 'cocoapods', '= 1.11.2' +gem 'cocoapods', '~> 1.11', '>= 1.11.2' gem 'rexml'