Skip to content

Commit c37d494

Browse files
Igor Klemenskifacebook-github-bot
Igor Klemenski
authored andcommitted
Work around max path length during source build of RN Android (#30776)
Summary: Building ReactAndroid from source on Windows has recently hit the limitation of maximum path lengths. At build time, during the `:ReactAndroid:buildReactNdkLib` task, the linker tries to access several of the intermediate binaries located deep in the tmp folder hierarchy, eg. ``` D:\r\ReactAndroid\build\tmp\buildReactNdkLib/local/armeabi-v7a/objs/react_render_components_progressbar/D_/r/ReactAndroid/__/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.o ``` **Suggested fix:** for modules such as `react_render_components_progressbar` and `react_render_components_picker`, rename them to `rrc_progressbar` etc. **NOTE**: this assumes that the fix from #30535 is in place. This regression happened while #30535 has been pending checkin. **Other mitigations I've tried:** - setting [`LOCAL_SHORT_COMMANDS`](https://developer.android.com/ndk/guides/android_mk#local_short_commands) for the problematic modules or `APP_SHORT_COMMANDS` for the root project. Turns out those commands don't work on the NDK version RN requires, but even after manually applying a [patch ](https://android-review.googlesource.com/c/platform/ndk/+/1126440) to my local copy of the NDK, these flags had no effect. - moving the repo directory higher in the file system tree, and using short directory names `D:\r\...` was not enough - creating virtual drive letters for specific long paths with the [`sust`](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/subst#examples) command is not workable, since they depend on the source folder structure, and get partly generated by the build system, which I can't plug into - just enabling long path support on Windows is not enough, since the compiler toolchain doesn't support them. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [Android] [Fixed] - Fix source build on Windows machines vol. 2 Pull Request resolved: #30776 Test Plan: Run `.\gradlew installArchives` Before: ![image](https://user-images.githubusercontent.com/12816515/105435667-a1e15d00-5c12-11eb-9fcd-d0c278aaf477.png) Now: ![image](https://user-images.githubusercontent.com/12816515/105435741-c2a9b280-5c12-11eb-88d5-a69ae56bbf50.png) Differential Revision: D26194286 Pulled By: mdvacca fbshipit-source-id: 778b5a0515148e2ace19e7902f74301831ebed94
1 parent 9d1e889 commit c37d494

File tree

22 files changed

+40
-40
lines changed

22 files changed

+40
-40
lines changed

ReactAndroid/Android-prebuilt.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ LOCAL_EXPORT_C_INCLUDES := \
140140
$(REACT_COMMON_DIR)/react/renderer/mounting
141141
include $(PREBUILT_SHARED_LIBRARY)
142142

143-
# react_render_components_view
143+
# rrc_view
144144
include $(CLEAR_VARS)
145-
LOCAL_MODULE := react_render_components_view
146-
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_components_view.so
145+
LOCAL_MODULE := rrc_view
146+
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/librrc_view.so
147147
LOCAL_EXPORT_C_INCLUDES := \
148148
$(REACT_COMMON_DIR)/react/renderer/components/view
149149
include $(PREBUILT_SHARED_LIBRARY)

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

14-
LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_progressbar libreact_render_components_switch libreact_render_components_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 libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_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 react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker
14+
LOCAL_SHARED_LIBRARIES := 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 libreact_render_mapbuffer 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 rrc_textinput rrc_picker
1515

1616
LOCAL_STATIC_LIBRARIES :=
1717

ReactCommon/react/renderer/animations/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libreact_render_graphics libglog_init glog libruntimeexecutor libyoga libreact_render_components_view libreact_render_uimanager libfolly_futures libreact_render_componentregistry libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_mounting
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/attributedstring/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libbetter libreact_render_graphics libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_components_view libreact_utils
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/image/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_image
10+
LOCAL_MODULE := rrc_image
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view libreact_render_imagemanager
24+
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/modal/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_modal
10+
LOCAL_MODULE := rrc_modal
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_image libreact_render_uimanager libreact_render_imagemanager libreact_render_components_view libreact_render_componentregistry libreact_codegen_rncore
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/picker/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_picker
10+
LOCAL_MODULE := rrc_picker
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidpicker/react/renderer/components/androidpicker/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_components_view libreact_render_componentregistry libreact_codegen_rncore
24+
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager librrc_view libreact_render_componentregistry libreact_codegen_rncore
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/progressbar/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_progressbar
10+
LOCAL_MODULE := rrc_progressbar
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
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 libreact_render_components_view
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/root/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_root
10+
LOCAL_MODULE := rrc_root
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
24+
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/scrollview/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_scrollview
10+
LOCAL_MODULE := rrc_scrollview
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
24+
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/slider/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_slider
10+
LOCAL_MODULE := rrc_slider
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/react/renderer/components/slider/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libreact_render_components_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/switch/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_switch
10+
LOCAL_MODULE := rrc_switch
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidswitch/react/renderer/components/androidswitch/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
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 libreact_render_components_view
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/text/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_text
10+
LOCAL_MODULE := rrc_text
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := 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 libreact_render_components_view libreact_utils
24+
LOCAL_SHARED_LIBRARIES := 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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/textinput/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_textinput
10+
LOCAL_MODULE := rrc_textinput
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := 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 libreact_render_components_text libreact_render_components_image libreact_render_components_view libreact_utils
24+
LOCAL_SHARED_LIBRARIES := 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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/unimplementedview/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_unimplementedview
10+
LOCAL_MODULE := rrc_unimplementedview
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
24+
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/components/view/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
77

88
include $(CLEAR_VARS)
99

10-
LOCAL_MODULE := react_render_components_view
10+
LOCAL_MODULE := rrc_view
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

ReactCommon/react/renderer/mounting/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_components_view libreact_render_components_root libreact_utils
24+
LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/scheduler/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libreact_render_components_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 libreact_render_components_root libreact_render_mounting
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

ReactCommon/react/renderer/uimanager/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libreact_render_graphics libfolly_futures libruntimeexecutor libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_components_view libreact_render_components_root libreact_render_mounting
24+
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
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
8080
8181
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
8282
83-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
83+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
8484
8585
LOCAL_STATIC_LIBRARIES := libjsi
8686

packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
5252
5353
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
5454
55-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
55+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
5656
5757
LOCAL_STATIC_LIBRARIES := libjsi
5858
@@ -118,7 +118,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
118118
119119
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
120120
121-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
121+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
122122
123123
LOCAL_STATIC_LIBRARIES := libjsi
124124
@@ -184,7 +184,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
184184
185185
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
186186
187-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
187+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
188188
189189
LOCAL_STATIC_LIBRARIES := libjsi
190190
@@ -258,7 +258,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
258258
259259
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
260260
261-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
261+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
262262
263263
LOCAL_STATIC_LIBRARIES := libjsi
264264
@@ -324,7 +324,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
324324
325325
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
326326
327-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
327+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
328328
329329
LOCAL_STATIC_LIBRARIES := libjsi
330330
@@ -398,7 +398,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
398398
399399
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
400400
401-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core libreact_render_components_view libreact_render_core libreact_render_graphics
401+
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics
402402
403403
LOCAL_STATIC_LIBRARIES := libjsi
404404

packages/rn-tester/android/app/src/main/jni/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LOCAL_MODULE := rntester_appmodules
1818
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
1919
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
2020
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
21-
LOCAL_SHARED_LIBRARIES := libfbjni libglog libfolly_json libyoga libreact_nativemodule_core libturbomodulejsijni libreact_render_components_view libreact_render_core libreact_render_graphics libreact_codegen_rncore
21+
LOCAL_SHARED_LIBRARIES := libfbjni libglog libfolly_json libyoga libreact_nativemodule_core libturbomodulejsijni librrc_view libreact_render_core libreact_render_graphics libreact_codegen_rncore
2222
LOCAL_STATIC_LIBRARIES := libsampleturbomodule
2323
LOCAL_CFLAGS := \
2424
-DLOG_TAG=\"ReactNative\"

0 commit comments

Comments
 (0)