From 041398a77593672c6b958c188138b2d34f951dc2 Mon Sep 17 00:00:00 2001 From: Andrei Shikov Date: Tue, 30 Nov 2021 08:30:21 -0800 Subject: [PATCH] Compile platform Android components into static libraries Summary: Removes extra .so files by merging built-in components into libfabricjni.so These components shouldn't be referenced in outside modules, so merging them is trivial atm. Changelog: [Internal][Android] - Compile native components into static libraries Reviewed By: cortinico Differential Revision: D32677572 fbshipit-source-id: fc1a6c5a2832ee49e438c30856562f85677514ea --- .../java/com/facebook/react/fabric/jni/Android.mk | 14 +++++++------- .../react/renderer/components/modal/Android.mk | 2 +- .../renderer/components/progressbar/Android.mk | 2 +- .../renderer/components/scrollview/Android.mk | 2 +- .../react/renderer/components/slider/Android.mk | 2 +- .../react/renderer/components/switch/Android.mk | 2 +- .../react/renderer/components/textinput/Android.mk | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) 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 37a5e5347ab..80a60e3982d 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 @@ -41,20 +41,20 @@ LOCAL_SHARED_LIBRARIES := \ libreact_config \ 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 := +LOCAL_STATIC_LIBRARIES := \ + librrc_slider \ + librrc_progressbar \ + librrc_switch \ + librrc_modal \ + librrc_scrollview \ + librrc_textinput LOCAL_C_INCLUDES := $(LOCAL_PATH)/ diff --git a/ReactCommon/react/renderer/components/modal/Android.mk b/ReactCommon/react/renderer/components/modal/Android.mk index bb20c000666..5cba44379cd 100644 --- a/ReactCommon/react/renderer/components/modal/Android.mk +++ b/ReactCommon/react/renderer/components/modal/Android.mk @@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,glog) $(call import-module,folly) diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk index 87583b8b405..78f3ede407c 100644 --- a/ReactCommon/react/renderer/components/progressbar/Android.mk +++ b/ReactCommon/react/renderer/components/progressbar/Android.mk @@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,fbjni) $(call import-module,folly) diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk index 2952e678da6..e875d6b8cb5 100644 --- a/ReactCommon/react/renderer/components/scrollview/Android.mk +++ b/ReactCommon/react/renderer/components/scrollview/Android.mk @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,glog) $(call import-module,folly) diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk index fd196580c79..b499f2cae2f 100644 --- a/ReactCommon/react/renderer/components/slider/Android.mk +++ b/ReactCommon/react/renderer/components/slider/Android.mk @@ -41,7 +41,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,fbjni) $(call import-module,folly) diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk index 4c24482bbb2..4efa8964dd2 100644 --- a/ReactCommon/react/renderer/components/switch/Android.mk +++ b/ReactCommon/react/renderer/components/switch/Android.mk @@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,fbjni) $(call import-module,folly) diff --git a/ReactCommon/react/renderer/components/textinput/Android.mk b/ReactCommon/react/renderer/components/textinput/Android.mk index 23afcb5ded6..acad90fc69b 100644 --- a/ReactCommon/react/renderer/components/textinput/Android.mk +++ b/ReactCommon/react/renderer/components/textinput/Android.mk @@ -43,7 +43,7 @@ LOCAL_SHARED_LIBRARIES := \ librrc_view \ libyoga -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) $(call import-module,glog) $(call import-module,folly)