diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index 547534b755b..2138829a1de 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -39,9 +39,9 @@ Pod::Spec.new do |s| } s.dependency "RCT-Folly", folly_version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version - s.dependency "FBReactNativeSpec", version s.dependency "React-Core/RCTAnimationHeaders", version end diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index e4b34411605..f63950228c0 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -53,6 +53,10 @@ Pod::Spec.new do |s| "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}" end + s.subspec "react_debug_core" do |sss| + sss.source_files = "react/debug/*.{cpp,h}" + end + ss.subspec "samples" do |sss| sss.source_files = "react/nativemodule/samples/ReactCommon/**/*.{cpp,h}", "react/nativemodule/samples/platform/ios/**/*.{mm,cpp,h}" diff --git a/ReactCommon/react/debug/Android.mk b/ReactCommon/react/debug/Android.mk index 14bb49bdc87..669418516b2 100644 --- a/ReactCommon/react/debug/Android.mk +++ b/ReactCommon/react/debug/Android.mk @@ -24,6 +24,8 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall -llog +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog + include $(BUILD_SHARED_LIBRARY) $(call import-module,folly) diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk index 70f7651b483..13339cab74d 100644 --- a/ReactCommon/react/nativemodule/core/Android.mk +++ b/ReactCommon/react/nativemodule/core/Android.mk @@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCA LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/ -LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni +LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug LOCAL_STATIC_LIBRARIES := libjsi libreactperflogger diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK index 18cc72b93f9..bf3ae66161b 100644 --- a/ReactCommon/react/nativemodule/core/BUCK +++ b/ReactCommon/react/nativemodule/core/BUCK @@ -79,6 +79,7 @@ rn_xplat_cxx_library( react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:module"), react_native_xplat_target("callinvoker:callinvoker"), + react_native_xplat_target("react/debug:debug"), react_native_xplat_target("reactperflogger:reactperflogger"), ], exported_deps = [ diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp index f00e8bb95e5..a8bb21897ba 100644 --- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -133,7 +134,7 @@ std::string stringifyJSIValue(const jsi::Value &v, jsi::Runtime *rt = nullptr) { return "a string (\"" + v.getString(*rt).utf8(*rt) + "\")"; } - assert(v.isObject() && "Expecting object."); + react_native_assert(v.isObject() && "Expecting object."); return rt != nullptr && v.getObject(*rt).isFunction(*rt) ? "a function" : "an object"; } diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk index d048ec00061..fd9e86cdb38 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk +++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk @@ -11,7 +11,7 @@ LOCAL_MODULE := react_render_textlayoutmanager LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp) -LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics +LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug LOCAL_STATIC_LIBRARIES := diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index d7d4889b4c7..3c56904b3df 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -802,7 +802,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: cde416483dac037923206447da6e1454df403714 + DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: 91e874a8823933a268c38765a88cbd5dba1fa024 FBReactNativeSpec: 6793f00102a091fb931674853172fb22e5a2c4cf Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 @@ -812,7 +812,7 @@ SPEC CHECKSUMS: Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 - glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 + glog: 5337263514dd6f09803962437687240c5dc39aa4 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c @@ -830,7 +830,7 @@ SPEC CHECKSUMS: React-jsinspector: 52fe8073736a97304c9bc61a5bbae8b66ca55701 React-perflogger: e5c447a0435eb9cdd1e5cd692a48b5c5463406b0 React-RCTActionSheet: 555656ac47e1b81d986a3822e22c374523e0ed17 - React-RCTAnimation: 639d6784188ee28b3cbb5c4915f18fb63b816a46 + React-RCTAnimation: 0bb7a765e92907fb44073438b3a6752ca4ef0df1 React-RCTBlob: b0af8ae625ea63199504c9cfe09151ebeae51884 React-RCTFabric: 447f94b853788b8868157002022bcaa911f2cf00 React-RCTImage: 8626895dc6dabc11f28e3d6a9eb866b2e2c2742d @@ -842,7 +842,7 @@ SPEC CHECKSUMS: React-RCTText: 83931feaad2b470868af24bf7b943cc52a84603d React-RCTVibration: c739e240076fd7dabd90d6242d6a949297565f72 React-runtimeexecutor: d3e89935c7d4733ddf7da3dd8e0b2533adb7bca4 - ReactCommon: 293077fd73008093e681d96ae99e34e56d47160a + ReactCommon: 959d51c4ce5f5885ffd44115a38052dc45b4a489 Yoga: 69c2b21737d8220f647e61141aec8c28f7249ef2 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a