diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk index 651168243ef..3e8c6633510 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk @@ -19,7 +19,13 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no LOCAL_CPP_FEATURES := exceptions LOCAL_STATIC_LIBRARIES := libjsireact -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libhermes \ + libjsi \ + libreactnativejni include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk index 7716394c31f..02a267a28c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk @@ -18,7 +18,13 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no LOCAL_CPP_FEATURES := exceptions LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libhermes \ + libjsi \ + libreactnativejni include $(BUILD_SHARED_LIBRARY) @@ -35,6 +41,12 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no LOCAL_CPP_FEATURES := exceptions LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libhermes \ + libjsi \ + libreactnativejni include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk index f29eb0137c0..321319cedfb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk @@ -11,7 +11,18 @@ LOCAL_MODULE := mapbufferjni LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp) -LOCAL_SHARED_LIBRARIES := libreactconfig libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_utils libreact_render_mapbuffer libreact_debug +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libglog_init \ + libreact_debug \ + libreact_render_mapbuffer \ + libreact_utils \ + libreactconfig \ + libyoga LOCAL_STATIC_LIBRARIES := 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 1c2bde705d6..f609513aabb 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 @@ -11,7 +11,48 @@ LOCAL_MODULE := fabricjni LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) -LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry libreact_render_runtimescheduler +LOCAL_SHARED_LIBRARIES := \ + libbetter \ + libfb \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libglog_init \ + libjsi \ + libmapbufferjni \ + libreact_codegen_rncore \ + libreact_debug \ + libreact_render_animations \ + libreact_render_attributedstring \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_imagemanager \ + libreact_render_mapbuffer \ + libreact_render_mounting \ + libreact_render_runtimescheduler \ + libreact_render_scheduler \ + libreact_render_telemetry \ + libreact_render_templateprocessor \ + libreact_render_textlayoutmanager \ + libreact_render_uimanager \ + libreact_utils \ + libreactconfig \ + libreactnativeutilsjni \ + librrc_image \ + librrc_modal \ + librrc_progressbar \ + librrc_root \ + librrc_scrollview \ + librrc_slider \ + librrc_switch \ + librrc_textinput \ + librrc_unimplementedview \ + librrc_view \ + libyoga \ + react_render_componentregistry \ + rrc_text LOCAL_STATIC_LIBRARIES := diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk index 19a28eee5af..ae5b88753e4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk @@ -16,6 +16,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti LOCAL_STATIC_LIBRARIES := libjsireact jscruntime -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libjsi \ + libreactnativejni include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk index 6c5a7224c78..d90fafcad51 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk @@ -16,6 +16,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti LOCAL_STATIC_LIBRARIES := libjsireact -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libjsi \ + libreactnativejni include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk index a4085b466b0..ae4ae8f8f5d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk @@ -11,7 +11,16 @@ LOCAL_MODULE := uimanagerjni LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) -LOCAL_SHARED_LIBRARIES := libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures react_render_componentregistry librrc_native +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libglog_init \ + librrc_native \ + libyoga \ + react_render_componentregistry LOCAL_STATIC_LIBRARIES := diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index 5faf3fac960..604a5313378 100644 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -27,7 +27,14 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture LOCAL_LDLIBS += -landroid # The dynamic libraries (.so files) that this module depends on. -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_render_runtimescheduler libruntimeexecutor +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 @@ -77,7 +84,16 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture LOCAL_LDLIBS += -landroid # The dynamic libraries (.so files) that this module depends on. -LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger libreact_render_runtimescheduler libruntimeexecutor +LOCAL_SHARED_LIBRARIES := \ + libfb \ + libfbjni \ + libfolly_json \ + libglog_init \ + libreact_render_runtimescheduler \ + libreactnativeutilsjni \ + libruntimeexecutor \ + libyoga \ + logger # The static libraries (.a files) that this module depends on. LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk index 88889238e72..a68feb1fb4c 100644 --- a/ReactCommon/cxxreact/Android.mk +++ b/ReactCommon/cxxreact/Android.mk @@ -19,8 +19,18 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture -LOCAL_STATIC_LIBRARIES := boost jsi callinvoker reactperflogger -LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog logger libruntimeexecutor +LOCAL_STATIC_LIBRARIES := \ + boost \ + callinvoker \ + jsi \ + reactperflogger + +LOCAL_SHARED_LIBRARIES := \ + glog \ + jsinspector \ + libfolly_json \ + libruntimeexecutor \ + logger include $(BUILD_STATIC_LIBRARY) diff --git a/ReactCommon/hermes/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk index 461b10aaac3..4d9dad0fe55 100644 --- a/ReactCommon/hermes/inspector/Android.mk +++ b/ReactCommon/hermes/inspector/Android.mk @@ -21,6 +21,14 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT) LOCAL_CPP_FEATURES := exceptions -LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes libjsi libglog +LOCAL_SHARED_LIBRARIES := \ + jsinspector \ + libfb \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libhermes \ + libjsi include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk index bb2a0d79c77..107d6b5bb40 100644 --- a/ReactCommon/react/nativemodule/core/Android.mk +++ b/ReactCommon/react/nativemodule/core/Android.mk @@ -15,7 +15,12 @@ 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 libreact_debug libjsi +LOCAL_SHARED_LIBRARIES := \ + libfbjni \ + libfolly_json \ + libjsi \ + libreact_debug \ + libreactnativejni LOCAL_STATIC_LIBRARIES := libreactperflogger diff --git a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk index a000332e34c..b0b316b779a 100644 --- a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk +++ b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk @@ -10,7 +10,11 @@ LOCAL_MODULE := sampleturbomodule LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libjsi +LOCAL_SHARED_LIBRARIES := \ + libfbjni \ + libjsi \ + libreact_nativemodule_core + LOCAL_CFLAGS := \ -DLOG_TAG=\"ReactNative\" LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall diff --git a/ReactCommon/react/renderer/animations/Android.mk b/ReactCommon/react/renderer/animations/Android.mk index c637dbb0d60..5011abc0283 100644 --- a/ReactCommon/react/renderer/animations/Android.mk +++ b/ReactCommon/react/renderer/animations/Android.mk @@ -21,7 +21,23 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libreact_render_graphics libglog_init glog libruntimeexecutor libyoga librrc_view libreact_render_uimanager libfolly_futures libreact_render_componentregistry libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_mounting libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mounting \ + libreact_render_uimanager \ + libreactconfig \ + librrc_view \ + libruntimeexecutor \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/attributedstring/Android.mk b/ReactCommon/react/renderer/attributedstring/Android.mk index c693f05d16f..a3aad33a020 100644 --- a/ReactCommon/react/renderer/attributedstring/Android.mk +++ b/ReactCommon/react/renderer/attributedstring/Android.mk @@ -21,7 +21,20 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libbetter libreact_render_graphics libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view libreact_utils libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libbetter \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mapbuffer \ + libreact_utils \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/componentregistry/Android.mk b/ReactCommon/react/renderer/componentregistry/Android.mk index 06297c72980..6274ad072d9 100644 --- a/ReactCommon/react/renderer/componentregistry/Android.mk +++ b/ReactCommon/react/renderer/componentregistry/Android.mk @@ -15,7 +15,15 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ -LOCAL_SHARED_LIBRARIES := libjsi libfolly_futures libfolly_json libreact_render_core libreact_render_debug libreact_utils libglog_init libreact_debug +LOCAL_SHARED_LIBRARIES := \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_utils LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" diff --git a/ReactCommon/react/renderer/componentregistry/native/Android.mk b/ReactCommon/react/renderer/componentregistry/native/Android.mk index f5674482f6b..fd93f123be3 100644 --- a/ReactCommon/react/renderer/componentregistry/native/Android.mk +++ b/ReactCommon/react/renderer/componentregistry/native/Android.mk @@ -15,7 +15,15 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../ -LOCAL_SHARED_LIBRARIES := libjsi libfolly_futures libfolly_json libreact_render_core libreact_render_debug libreact_utils libglog_init libreact_debug +LOCAL_SHARED_LIBRARIES := \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_utils LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" diff --git a/ReactCommon/react/renderer/components/image/Android.mk b/ReactCommon/react/renderer/components/image/Android.mk index 8c3fbcabda9..9742f20973d 100644 --- a/ReactCommon/react/renderer/components/image/Android.mk +++ b/ReactCommon/react/renderer/components/image/Android.mk @@ -21,7 +21,19 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_imagemanager \ + libreact_render_mapbuffer \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/modal/Android.mk b/ReactCommon/react/renderer/components/modal/Android.mk index cd0a046e732..bb20c000666 100644 --- a/ReactCommon/react/renderer/components/modal/Android.mk +++ b/ReactCommon/react/renderer/components/modal/Android.mk @@ -21,7 +21,21 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_image libreact_render_uimanager libreact_render_imagemanager librrc_view libreact_render_componentregistry libreact_codegen_rncore libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_json \ + libglog_init \ + libreact_codegen_rncore \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_imagemanager \ + libreact_render_mapbuffer \ + libreact_render_uimanager \ + librrc_image \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk index b899b97bada..87583b8b405 100644 --- a/ReactCommon/react/renderer/components/progressbar/Android.mk +++ b/ReactCommon/react/renderer/components/progressbar/Android.mk @@ -21,7 +21,22 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_codegen_rncore \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_uimanager \ + libreactnativeutilsjni \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/root/Android.mk b/ReactCommon/react/renderer/components/root/Android.mk index 8149fe3f02f..4d8cca7fbc1 100644 --- a/ReactCommon/react/renderer/components/root/Android.mk +++ b/ReactCommon/react/renderer/components/root/Android.mk @@ -21,7 +21,17 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk index 9b02ae73f04..2952e678da6 100644 --- a/ReactCommon/react/renderer/components/scrollview/Android.mk +++ b/ReactCommon/react/renderer/components/scrollview/Android.mk @@ -21,7 +21,19 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mapbuffer \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk index 101ed6ee564..fd196580c79 100644 --- a/ReactCommon/react/renderer/components/slider/Android.mk +++ b/ReactCommon/react/renderer/components/slider/Android.mk @@ -21,7 +21,25 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_codegen_rncore \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_imagemanager \ + libreact_render_mapbuffer \ + libreact_render_uimanager \ + libreactnativeutilsjni \ + librrc_image \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk index ec7b041a63e..4c24482bbb2 100644 --- a/ReactCommon/react/renderer/components/switch/Android.mk +++ b/ReactCommon/react/renderer/components/switch/Android.mk @@ -21,7 +21,22 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_codegen_rncore \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_uimanager \ + libreactnativeutilsjni \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/text/Android.mk b/ReactCommon/react/renderer/components/text/Android.mk index 33bfdb78a96..6aa12f5aab8 100644 --- a/ReactCommon/react/renderer/components/text/Android.mk +++ b/ReactCommon/react/renderer/components/text/Android.mk @@ -21,7 +21,23 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_attributedstring \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mapbuffer \ + libreact_render_mounting \ + libreact_render_textlayoutmanager \ + libreact_render_uimanager \ + libreact_utils \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/textinput/Android.mk b/ReactCommon/react/renderer/components/textinput/Android.mk index c45affab7b9..23afcb5ded6 100644 --- a/ReactCommon/react/renderer/components/textinput/Android.mk +++ b/ReactCommon/react/renderer/components/textinput/Android.mk @@ -21,7 +21,27 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_attributedstring \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_imagemanager \ + libreact_render_mapbuffer \ + libreact_render_mounting \ + libreact_render_textlayoutmanager \ + libreact_render_uimanager \ + libreact_utils \ + librrc_image \ + librrc_text \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/unimplementedview/Android.mk b/ReactCommon/react/renderer/components/unimplementedview/Android.mk index 959500fb70d..f0abaa39b3c 100644 --- a/ReactCommon/react/renderer/components/unimplementedview/Android.mk +++ b/ReactCommon/react/renderer/components/unimplementedview/Android.mk @@ -21,7 +21,18 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/components/view/Android.mk b/ReactCommon/react/renderer/components/view/Android.mk index 2f820d3cc50..7584b83b534 100644 --- a/ReactCommon/react/renderer/components/view/Android.mk +++ b/ReactCommon/react/renderer/components/view/Android.mk @@ -21,7 +21,17 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger libjsi +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libyoga \ + logger \ include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/core/Android.mk b/ReactCommon/react/renderer/core/Android.mk index 32a8ddf5efe..faf792da004 100644 --- a/ReactCommon/react/renderer/core/Android.mk +++ b/ReactCommon/react/renderer/core/Android.mk @@ -15,7 +15,15 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ -LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics libglog +LOCAL_SHARED_LIBRARIES := \ + libfolly_futures \ + libfolly_json \ + libglog \ + libjsi \ + libreact_debug \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_utils LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" diff --git a/ReactCommon/react/renderer/graphics/Android.mk b/ReactCommon/react/renderer/graphics/Android.mk index 94e3adbce79..2f41482eaa9 100644 --- a/ReactCommon/react/renderer/graphics/Android.mk +++ b/ReactCommon/react/renderer/graphics/Android.mk @@ -11,7 +11,13 @@ LOCAL_MODULE := react_render_graphics LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp) -LOCAL_SHARED_LIBRARIES := libfolly_json libreact_debug libfb libfbjni libfolly_json glog +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfb \ + libfbjni \ + libfolly_json \ + libfolly_json \ + libreact_debug LOCAL_STATIC_LIBRARIES := diff --git a/ReactCommon/react/renderer/imagemanager/Android.mk b/ReactCommon/react/renderer/imagemanager/Android.mk index 83f3ae91f45..01f301feb57 100644 --- a/ReactCommon/react/renderer/imagemanager/Android.mk +++ b/ReactCommon/react/renderer/imagemanager/Android.mk @@ -11,7 +11,14 @@ LOCAL_MODULE := react_render_imagemanager LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp) -LOCAL_SHARED_LIBRARIES := libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_mounting libreact_debug +LOCAL_SHARED_LIBRARIES := \ + libfolly_json \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mounting \ + libyoga LOCAL_STATIC_LIBRARIES := diff --git a/ReactCommon/react/renderer/leakchecker/Android.mk b/ReactCommon/react/renderer/leakchecker/Android.mk index 48056bc8dd2..9447ec630d0 100644 --- a/ReactCommon/react/renderer/leakchecker/Android.mk +++ b/ReactCommon/react/renderer/leakchecker/Android.mk @@ -15,7 +15,10 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ -LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core glog +LOCAL_SHARED_LIBRARIES := \ + glog \ + libreact_render_core \ + libruntimeexecutor LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" diff --git a/ReactCommon/react/renderer/mapbuffer/Android.mk b/ReactCommon/react/renderer/mapbuffer/Android.mk index 57c51b2ec4c..9089b45e679 100644 --- a/ReactCommon/react/renderer/mapbuffer/Android.mk +++ b/ReactCommon/react/renderer/mapbuffer/Android.mk @@ -21,7 +21,10 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := glog libglog_init libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libglog_init \ + libreact_debug include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/mounting/Android.mk b/ReactCommon/react/renderer/mounting/Android.mk index efd902e42ca..1de6b4347a1 100644 --- a/ReactCommon/react/renderer/mounting/Android.mk +++ b/ReactCommon/react/renderer/mounting/Android.mk @@ -21,7 +21,22 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_graphics libreact_render_telemetry +LOCAL_SHARED_LIBRARIES := \ + glog \ + libbetter \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_telemetry \ + libreact_utils \ + librrc_root \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/runtimescheduler/Android.mk b/ReactCommon/react/renderer/runtimescheduler/Android.mk index b67a8e63290..336d017b752 100644 --- a/ReactCommon/react/renderer/runtimescheduler/Android.mk +++ b/ReactCommon/react/renderer/runtimescheduler/Android.mk @@ -15,7 +15,12 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ -LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi callinvoker +LOCAL_SHARED_LIBRARIES := \ + callinvoker \ + libjsi \ + libreact_debug \ + libreact_render_core \ + libruntimeexecutor \ LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" diff --git a/ReactCommon/react/renderer/scheduler/Android.mk b/ReactCommon/react/renderer/scheduler/Android.mk index 32b8f71dd04..465cb37a6ba 100644 --- a/ReactCommon/react/renderer/scheduler/Android.mk +++ b/ReactCommon/react/renderer/scheduler/Android.mk @@ -21,7 +21,25 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libyoga librrc_view libreact_utils libreact_render_templateprocessor libreact_render_graphics libreact_render_uimanager libfolly_futures libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug librrc_root libreact_render_mounting libreact_debug libreact_render_runtimescheduler +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libjsi \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mounting \ + libreact_render_runtimescheduler \ + libreact_render_templateprocessor \ + libreact_render_uimanager \ + libreact_utils \ + libreactconfig \ + librrc_root \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/telemetry/Android.mk b/ReactCommon/react/renderer/telemetry/Android.mk index 990ec538ff5..1fc54803d70 100644 --- a/ReactCommon/react/renderer/telemetry/Android.mk +++ b/ReactCommon/react/renderer/telemetry/Android.mk @@ -21,7 +21,19 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug +LOCAL_SHARED_LIBRARIES := \ + glog \ + libbetter \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libreact_debug \ + libreact_render_core \ + libreact_render_debug \ + libreact_utils \ + librrc_root \ + librrc_view \ + libyoga include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/templateprocessor/Android.mk b/ReactCommon/react/renderer/templateprocessor/Android.mk index 23ebd6b9a60..e694718407d 100644 --- a/ReactCommon/react/renderer/templateprocessor/Android.mk +++ b/ReactCommon/react/renderer/templateprocessor/Android.mk @@ -21,7 +21,17 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libfolly_futures libreact_utils libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug react_render_uimanager +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libjsi \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_utils \ + libreactconfig \ + react_render_uimanager include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk index 0d216e57276..6571b2bbbc2 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk +++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk @@ -11,7 +11,27 @@ 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 libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfb \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog_init \ + libmapbufferjni \ + libreact_debug \ + libreact_render_attributedstring \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_mapbuffer \ + libreact_render_mounting \ + libreact_render_telemetry \ + libreact_render_uimanager \ + libreact_utils \ + libreactnativeutilsjni \ + libyoga LOCAL_STATIC_LIBRARIES := diff --git a/ReactCommon/react/renderer/uimanager/Android.mk b/ReactCommon/react/renderer/uimanager/Android.mk index 47975cd7dad..1626d1b6acc 100644 --- a/ReactCommon/react/renderer/uimanager/Android.mk +++ b/ReactCommon/react/renderer/uimanager/Android.mk @@ -21,7 +21,22 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libreact_render_graphics libfolly_futures libruntimeexecutor libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug librrc_view librrc_root libreact_render_mounting libreact_debug libreact_render_leakchecker +LOCAL_SHARED_LIBRARIES := \ + glog \ + libfolly_futures \ + libfolly_json \ + libjsi \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + libreact_render_leakchecker \ + libreact_render_mounting \ + libreactconfig \ + librrc_root \ + librrc_view \ + libruntimeexecutor include $(BUILD_SHARED_LIBRARY) diff --git a/ReactCommon/react/utils/Android.mk b/ReactCommon/react/utils/Android.mk index 471b15e6cff..c16041b8d9b 100644 --- a/ReactCommon/react/utils/Android.mk +++ b/ReactCommon/react/utils/Android.mk @@ -20,7 +20,11 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := libreact_debug libreact_render_mapbuffer libglog libglog_init +LOCAL_SHARED_LIBRARIES := \ + libglog \ + libglog_init \ + libreact_debug \ + libreact_render_mapbuffer include $(BUILD_SHARED_LIBRARY) diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk index ec3279086cb..5c512235b5a 100644 --- a/packages/rn-tester/android/app/src/main/jni/Android.mk +++ b/packages/rn-tester/android/app/src/main/jni/Android.mk @@ -19,7 +19,25 @@ LOCAL_MODULE := rntester_appmodules LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni -LOCAL_SHARED_LIBRARIES := libfbjni libglog libfolly_json libfolly_futures libyoga libreact_nativemodule_core libturbomodulejsijni librrc_view libreact_render_core libreact_render_graphics libreact_codegen_rncore libfabricjni libreact_render_componentregistry libruntimeexecutor libreact_debug libreact_render_debug libreact_codegen_rntester +LOCAL_SHARED_LIBRARIES := \ + libfabricjni \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libreact_codegen_rncore \ + libreact_codegen_rntester \ + libreact_debug \ + libreact_nativemodule_core \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + librrc_view \ + libruntimeexecutor \ + libturbomodulejsijni \ + libyoga + LOCAL_STATIC_LIBRARIES := libsampleturbomodule LOCAL_CFLAGS := \