From 10f26e9e84514838f35faf80f29a209a5f47371d Mon Sep 17 00:00:00 2001 From: Ricky Date: Tue, 6 Sep 2022 13:00:59 -0400 Subject: [PATCH 1/4] Revert renaming native components (#3301) --- docs/intro-react-native-components.md | 14 +++++++------- docs/introduction.md | 4 ++-- .../version-0.70/intro-react-native-components.md | 14 +++++++------- .../versioned_docs/version-0.70/introduction.md | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/intro-react-native-components.md b/docs/intro-react-native-components.md index 00d22878aad..54eb7f69311 100644 --- a/docs/intro-react-native-components.md +++ b/docs/intro-react-native-components.md @@ -1,7 +1,7 @@ --- id: intro-react-native-components -title: Core Components and Fabric Components -description: 'React Native lets you compose app interfaces using Fabric Components. Conveniently, it comes with a set of these components for you to get started with right now—the Core Components!' +title: Core Components and Native Components +description: 'React Native lets you compose app interfaces using Native Components. Conveniently, it comes with a set of these components for you to get started with right now—the Core Components!' --- import ThemedImage from '@theme/ThemedImage'; @@ -17,17 +17,17 @@ In Android and iOS development, a **view** is the basic building block of UI: a
Just a sampling of the many views used in Android and iOS apps.
-## Fabric Components +## Native Components -In Android development, you write views in Kotlin or Java; in iOS development, you use Swift or Objective-C. With React Native, you can invoke these views with JavaScript using React components. At runtime, React Native creates the corresponding Android and iOS views for those components. Because React Native components are backed by the same views as Android and iOS, React Native apps look, feel, and perform like any other apps. We call these platform-backed components **Fabric Components.** [_Fabric_](architecture/fabric-renderer) is the name of the React Native renderer, therefore components that are rendered via Fabric are called Fabric Components. +In Android development, you write views in Kotlin or Java; in iOS development, you use Swift or Objective-C. With React Native, you can invoke these views with JavaScript using React components. At runtime, React Native creates the corresponding Android and iOS views for those components. Because React Native components are backed by the same views as Android and iOS, React Native apps look, feel, and perform like any other apps. We call these platform-backed components **Native Components.** -React Native comes with a set of essential, ready-to-use Fabric Components you can use to start building your app today. These are React Native's **Core Components**. +React Native comes with a set of essential, ready-to-use Native Components you can use to start building your app today. These are React Native's **Core Components**. -React Native also lets you build your own [Fabric Components](the-new-architecture/pillars-fabric-components) to suit your app’s unique needs. We also have a thriving ecosystem of these **community-contributed components.** Check out [Native Directory](https://reactnative.directory) to find what the community has been creating. +React Native also lets you build your own Native Components for [Android](native-components-android.md) and [iOS](native-components-ios.md) to suit your app’s unique needs. We also have a thriving ecosystem of these **community-contributed components.** Check out [Native Directory](https://reactnative.directory) to find what the community has been creating. ## Core Components -React Native has many Core Components for everything form controls to activity indicators. You can find them all [documented in the API section](components-and-apis). You will mostly work with the following Core Components: +React Native has many Core Components for everything from controls to activity indicators. You can find them all [documented in the API section](components-and-apis). You will mostly work with the following Core Components: | React Native UI Component | Android View | iOS View | Web Analog | Description | | ------------------------- | -------------- | ---------------- | ----------------------- | ----------------------------------------------------------------------------------------------------- | diff --git a/docs/introduction.md b/docs/introduction.md index 1e4c9abbdbe..f77b91adf9b 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -8,7 +8,7 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; import con

- Welcome to the very start of your React Native journey! If you're looking for environment setup instructions, they've moved to their own section. Continue reading for an introduction to the documentation, Fabric Components, React, and more! + Welcome to the very start of your React Native journey! If you're looking for environment setup instructions, they've moved to their own section. Continue reading for an introduction to the documentation, Native Components, React, and more!

@@ -136,4 +136,4 @@ Menu paths are written in bold and use carets to navigate submenus. Example: **A --- -Now that you know how this guide works, it's time to get to know the foundation of React Native: [Fabric Components](intro-react-native-components.md). +Now that you know how this guide works, it's time to get to know the foundation of React Native: [Native Components](intro-react-native-components.md). diff --git a/website/versioned_docs/version-0.70/intro-react-native-components.md b/website/versioned_docs/version-0.70/intro-react-native-components.md index 00d22878aad..54eb7f69311 100644 --- a/website/versioned_docs/version-0.70/intro-react-native-components.md +++ b/website/versioned_docs/version-0.70/intro-react-native-components.md @@ -1,7 +1,7 @@ --- id: intro-react-native-components -title: Core Components and Fabric Components -description: 'React Native lets you compose app interfaces using Fabric Components. Conveniently, it comes with a set of these components for you to get started with right now—the Core Components!' +title: Core Components and Native Components +description: 'React Native lets you compose app interfaces using Native Components. Conveniently, it comes with a set of these components for you to get started with right now—the Core Components!' --- import ThemedImage from '@theme/ThemedImage'; @@ -17,17 +17,17 @@ In Android and iOS development, a **view** is the basic building block of UI: a
Just a sampling of the many views used in Android and iOS apps.
-## Fabric Components +## Native Components -In Android development, you write views in Kotlin or Java; in iOS development, you use Swift or Objective-C. With React Native, you can invoke these views with JavaScript using React components. At runtime, React Native creates the corresponding Android and iOS views for those components. Because React Native components are backed by the same views as Android and iOS, React Native apps look, feel, and perform like any other apps. We call these platform-backed components **Fabric Components.** [_Fabric_](architecture/fabric-renderer) is the name of the React Native renderer, therefore components that are rendered via Fabric are called Fabric Components. +In Android development, you write views in Kotlin or Java; in iOS development, you use Swift or Objective-C. With React Native, you can invoke these views with JavaScript using React components. At runtime, React Native creates the corresponding Android and iOS views for those components. Because React Native components are backed by the same views as Android and iOS, React Native apps look, feel, and perform like any other apps. We call these platform-backed components **Native Components.** -React Native comes with a set of essential, ready-to-use Fabric Components you can use to start building your app today. These are React Native's **Core Components**. +React Native comes with a set of essential, ready-to-use Native Components you can use to start building your app today. These are React Native's **Core Components**. -React Native also lets you build your own [Fabric Components](the-new-architecture/pillars-fabric-components) to suit your app’s unique needs. We also have a thriving ecosystem of these **community-contributed components.** Check out [Native Directory](https://reactnative.directory) to find what the community has been creating. +React Native also lets you build your own Native Components for [Android](native-components-android.md) and [iOS](native-components-ios.md) to suit your app’s unique needs. We also have a thriving ecosystem of these **community-contributed components.** Check out [Native Directory](https://reactnative.directory) to find what the community has been creating. ## Core Components -React Native has many Core Components for everything form controls to activity indicators. You can find them all [documented in the API section](components-and-apis). You will mostly work with the following Core Components: +React Native has many Core Components for everything from controls to activity indicators. You can find them all [documented in the API section](components-and-apis). You will mostly work with the following Core Components: | React Native UI Component | Android View | iOS View | Web Analog | Description | | ------------------------- | -------------- | ---------------- | ----------------------- | ----------------------------------------------------------------------------------------------------- | diff --git a/website/versioned_docs/version-0.70/introduction.md b/website/versioned_docs/version-0.70/introduction.md index 1e4c9abbdbe..f77b91adf9b 100644 --- a/website/versioned_docs/version-0.70/introduction.md +++ b/website/versioned_docs/version-0.70/introduction.md @@ -8,7 +8,7 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; import con

- Welcome to the very start of your React Native journey! If you're looking for environment setup instructions, they've moved to their own section. Continue reading for an introduction to the documentation, Fabric Components, React, and more! + Welcome to the very start of your React Native journey! If you're looking for environment setup instructions, they've moved to their own section. Continue reading for an introduction to the documentation, Native Components, React, and more!

@@ -136,4 +136,4 @@ Menu paths are written in bold and use carets to navigate submenus. Example: **A --- -Now that you know how this guide works, it's time to get to know the foundation of React Native: [Fabric Components](intro-react-native-components.md). +Now that you know how this guide works, it's time to get to know the foundation of React Native: [Native Components](intro-react-native-components.md). From d9d4adb410e689f6e56167cd2c25765fc884a1b4 Mon Sep 17 00:00:00 2001 From: Vojtech Novak Date: Wed, 7 Sep 2022 09:08:34 +0200 Subject: [PATCH 2/4] docs: fix path in script example (#3302) --- docs/new-architecture-library-ios.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/new-architecture-library-ios.md b/docs/new-architecture-library-ios.md index c5054bd6e8e..67a78515da1 100644 --- a/docs/new-architecture-library-ios.md +++ b/docs/new-architecture-library-ios.md @@ -50,7 +50,7 @@ While this generated native interface code **will not ship as part of your libra ```sh cd -node node_modules/react_native/scripts/generate-artifacts.js \ +node node_modules/react-native/scripts/generate-artifacts.js \ --path / \ --outputPath \ ``` From 000d5811452c859d49e528236abf3ad6bda30333 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 8 Sep 2022 09:49:49 +0100 Subject: [PATCH 3/4] Update New Architecture instructions to use CMake instead of Android.mk (#3304) --- docs/new-architecture-app-modules-android.md | 94 ++++--------------- docs/new-architecture-app-renderer-android.md | 2 +- docs/new-architecture-library-android.md | 1 + docs/the-new-architecture/pillars-codegen.md | 1 + .../pillars-turbomodule.md | 1 + .../new-architecture-app-modules-android.md | 94 ++++--------------- .../new-architecture-app-renderer-android.md | 2 +- .../new-architecture-library-android.md | 1 + 8 files changed, 42 insertions(+), 154 deletions(-) diff --git a/docs/new-architecture-app-modules-android.md b/docs/new-architecture-app-modules-android.md index d6dd904f477..b3e8fddfb7c 100644 --- a/docs/new-architecture-app-modules-android.md +++ b/docs/new-architecture-app-modules-android.md @@ -32,30 +32,20 @@ android { // Add this block externalNativeBuild { - ndkBuild { - arguments "APP_PLATFORM=android-21", - "APP_STL=c++_shared", - "NDK_TOOLCHAIN_VERSION=clang", - "GENERATED_SRC_DIR=$buildDir/generated/source", - "PROJECT_BUILD_DIR=$buildDir", - "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "NODE_MODULES_DIR=$rootDir/../node_modules" - cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1" - cppFlags "-std=c++17" - targets "myapplication_appmodules" - // Fix for windows limit on number of character in file paths and in command lines - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - arguments "NDK_APP_SHORT_COMMANDS=true" - } + cmake { + arguments "-DPROJECT_BUILD_DIR=$buildDir", + "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", + "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", + "-DNODE_MODULES_DIR=$rootDir/../node_modules", + "-DANDROID_STL=c++_shared" } } } // Add this block externalNativeBuild { - ndkBuild { - path "$projectDir/src/main/jni/Android.mk" + cmake { + path "$projectDir/src/main/jni/CMakeLists.txt" } } } @@ -77,8 +67,8 @@ android { afterEvaluate { preBuild.dependsOn(packageReactNdkLibs) - configureNdkBuildDebug.dependsOn(preBuild) - configureNdkBuildRelease.dependsOn(preBuild) + configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) + configureCMakeDebug.dependsOn(preDebugBuild) } packagingOptions { @@ -88,64 +78,16 @@ android { } ``` -Finally, we need to create a Makefile inside the `src/main/jni` folder called `Android.mk` with the following content: +Finally, we need to create a CMake file inside the `src/main/jni` folder called `CMakeLists.txt` with the following content: -```makefile -THIS_DIR := $(call my-dir) +```cmake +cmake_minimum_required(VERSION 3.13) -include $(REACT_ANDROID_DIR)/Android-prebuilt.mk +# Define the library name here. +project(myapplication_appmodules) -# If you wish to add a custom TurboModule or Fabric component in your app you -# will have to include the following autogenerated makefile. -# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk - -# Includes the MK file for autolinked libraries -include $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/Android-rncli.mk - -include $(CLEAR_VARS) - -LOCAL_PATH := $(THIS_DIR) - -# You can customize the name of your application .so file here. -LOCAL_MODULE := awesomeapp_appmodules - -LOCAL_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni -LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/*.cpp) -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni - -# If you wish to add a custom TurboModule or Fabric component in your app you -# will have to uncomment those lines to include the generated source -# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni) -# -# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni -# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp) -# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni - -# Here you should add any native library you wish to depend on. -LOCAL_SHARED_LIBRARIES := \ -libfabricjni \ -libfbjni \ -libfolly_runtime \ -libglog \ -libjsi \ -libreact_codegen_rncore \ -libreact_debug \ -libreact_nativemodule_core \ -libreact_render_componentregistry \ -libreact_render_core \ -libreact_render_debug \ -libreact_render_graphics \ -librrc_view \ -libruntimeexecutor \ -libturbomodulejsijni \ -libyoga - -# Autolinked libraries -LOCAL_SHARED_LIBRARIES += $(call import-codegen-modules) - -LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 - -include $(BUILD_SHARED_LIBRARY) +# This file includes all the necessary to let you build your application with the New Architecture. +include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) ``` This setup will run a native build on your project and will compile the C++ files that have been generated by the codegen. You will see the native build running with the Gradle task `:app:externalNativeBuildDebug` @@ -249,7 +191,7 @@ protected constructor( -Please note that the `SoLoader.loadLibrary` parameter (in this case `"myapplication_appmodules")` should be the same as the one specified for `LOCAL_MODULE :=` inside the `Android.mk` file you created before. +Please note that the `SoLoader.loadLibrary` parameter (in this case `"myapplication_appmodules")` should be the same as the one specified for `project()` inside the `CMakeLists.txt` file you created before. This class will then be responsible of loading the TurboModules and will take care of loading the native library build with the NDK at runtime. diff --git a/docs/new-architecture-app-renderer-android.md b/docs/new-architecture-app-renderer-android.md index 4b7bbe88b04..736abcb8f56 100644 --- a/docs/new-architecture-app-renderer-android.md +++ b/docs/new-architecture-app-renderer-android.md @@ -113,7 +113,7 @@ LOG Running "App" with {"fabric":true,"initialProps":{},"rootTag":1} ## Migrating Android ViewManagers -First, make sure you followed the instructions to [Enabling the New Renderer (Fabric) in Your Android Application](#enabling-the-new-renderer-fabric-in-your-android-application). Plus we will also assume that you followed the instructions from [Enabling the New NativeModule System (TurboModule) in Your Android Application](#enabling-the-new-nativemodule-system-turbomodule-in-your-android-application) as the Makefile (`Android.mk`) and other native builds setup steps are presented over there and won’t be repeated here. +First, make sure you followed the instructions to [Enabling the New Renderer (Fabric) in Your Android Application](#enabling-the-new-renderer-fabric-in-your-android-application). Plus we will also assume that you followed the instructions from [Enabling the New NativeModule System (TurboModule) in Your Android Application](#enabling-the-new-nativemodule-system-turbomodule-in-your-android-application) as the native builds setup steps are presented over there and won’t be repeated here. ### JavaScript changes diff --git a/docs/new-architecture-library-android.md b/docs/new-architecture-library-android.md index 565546a12d0..09f1ee2fb7f 100644 --- a/docs/new-architecture-library-android.md +++ b/docs/new-architecture-library-android.md @@ -34,6 +34,7 @@ app/build/generated/source/codegen │ └── NativeAwesomeManagerSpec.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── react │ │ └── renderer │ │ └── components diff --git a/docs/the-new-architecture/pillars-codegen.md b/docs/the-new-architecture/pillars-codegen.md index c55db88d267..11bd5062190 100644 --- a/docs/the-new-architecture/pillars-codegen.md +++ b/docs/the-new-architecture/pillars-codegen.md @@ -162,6 +162,7 @@ codegen │ └── MyTurbomodule.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── MyTurbomodule-generated.cpp │ ├── MyTurbomodule.h │ └── react diff --git a/docs/the-new-architecture/pillars-turbomodule.md b/docs/the-new-architecture/pillars-turbomodule.md index 9ccd7a9820f..77159a4fc24 100644 --- a/docs/the-new-architecture/pillars-turbomodule.md +++ b/docs/the-new-architecture/pillars-turbomodule.md @@ -497,6 +497,7 @@ codegen │ └── NativeCalculatorSpec.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── RTNCalculator-generated.cpp │ ├── RTNCalculator.h │ └── react diff --git a/website/versioned_docs/version-0.70/new-architecture-app-modules-android.md b/website/versioned_docs/version-0.70/new-architecture-app-modules-android.md index d6dd904f477..b3e8fddfb7c 100644 --- a/website/versioned_docs/version-0.70/new-architecture-app-modules-android.md +++ b/website/versioned_docs/version-0.70/new-architecture-app-modules-android.md @@ -32,30 +32,20 @@ android { // Add this block externalNativeBuild { - ndkBuild { - arguments "APP_PLATFORM=android-21", - "APP_STL=c++_shared", - "NDK_TOOLCHAIN_VERSION=clang", - "GENERATED_SRC_DIR=$buildDir/generated/source", - "PROJECT_BUILD_DIR=$buildDir", - "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "NODE_MODULES_DIR=$rootDir/../node_modules" - cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1" - cppFlags "-std=c++17" - targets "myapplication_appmodules" - // Fix for windows limit on number of character in file paths and in command lines - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - arguments "NDK_APP_SHORT_COMMANDS=true" - } + cmake { + arguments "-DPROJECT_BUILD_DIR=$buildDir", + "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", + "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", + "-DNODE_MODULES_DIR=$rootDir/../node_modules", + "-DANDROID_STL=c++_shared" } } } // Add this block externalNativeBuild { - ndkBuild { - path "$projectDir/src/main/jni/Android.mk" + cmake { + path "$projectDir/src/main/jni/CMakeLists.txt" } } } @@ -77,8 +67,8 @@ android { afterEvaluate { preBuild.dependsOn(packageReactNdkLibs) - configureNdkBuildDebug.dependsOn(preBuild) - configureNdkBuildRelease.dependsOn(preBuild) + configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) + configureCMakeDebug.dependsOn(preDebugBuild) } packagingOptions { @@ -88,64 +78,16 @@ android { } ``` -Finally, we need to create a Makefile inside the `src/main/jni` folder called `Android.mk` with the following content: +Finally, we need to create a CMake file inside the `src/main/jni` folder called `CMakeLists.txt` with the following content: -```makefile -THIS_DIR := $(call my-dir) +```cmake +cmake_minimum_required(VERSION 3.13) -include $(REACT_ANDROID_DIR)/Android-prebuilt.mk +# Define the library name here. +project(myapplication_appmodules) -# If you wish to add a custom TurboModule or Fabric component in your app you -# will have to include the following autogenerated makefile. -# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk - -# Includes the MK file for autolinked libraries -include $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/Android-rncli.mk - -include $(CLEAR_VARS) - -LOCAL_PATH := $(THIS_DIR) - -# You can customize the name of your application .so file here. -LOCAL_MODULE := awesomeapp_appmodules - -LOCAL_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni -LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/*.cpp) -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni - -# If you wish to add a custom TurboModule or Fabric component in your app you -# will have to uncomment those lines to include the generated source -# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni) -# -# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni -# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp) -# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni - -# Here you should add any native library you wish to depend on. -LOCAL_SHARED_LIBRARIES := \ -libfabricjni \ -libfbjni \ -libfolly_runtime \ -libglog \ -libjsi \ -libreact_codegen_rncore \ -libreact_debug \ -libreact_nativemodule_core \ -libreact_render_componentregistry \ -libreact_render_core \ -libreact_render_debug \ -libreact_render_graphics \ -librrc_view \ -libruntimeexecutor \ -libturbomodulejsijni \ -libyoga - -# Autolinked libraries -LOCAL_SHARED_LIBRARIES += $(call import-codegen-modules) - -LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 - -include $(BUILD_SHARED_LIBRARY) +# This file includes all the necessary to let you build your application with the New Architecture. +include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) ``` This setup will run a native build on your project and will compile the C++ files that have been generated by the codegen. You will see the native build running with the Gradle task `:app:externalNativeBuildDebug` @@ -249,7 +191,7 @@ protected constructor( -Please note that the `SoLoader.loadLibrary` parameter (in this case `"myapplication_appmodules")` should be the same as the one specified for `LOCAL_MODULE :=` inside the `Android.mk` file you created before. +Please note that the `SoLoader.loadLibrary` parameter (in this case `"myapplication_appmodules")` should be the same as the one specified for `project()` inside the `CMakeLists.txt` file you created before. This class will then be responsible of loading the TurboModules and will take care of loading the native library build with the NDK at runtime. diff --git a/website/versioned_docs/version-0.70/new-architecture-app-renderer-android.md b/website/versioned_docs/version-0.70/new-architecture-app-renderer-android.md index 4b7bbe88b04..736abcb8f56 100644 --- a/website/versioned_docs/version-0.70/new-architecture-app-renderer-android.md +++ b/website/versioned_docs/version-0.70/new-architecture-app-renderer-android.md @@ -113,7 +113,7 @@ LOG Running "App" with {"fabric":true,"initialProps":{},"rootTag":1} ## Migrating Android ViewManagers -First, make sure you followed the instructions to [Enabling the New Renderer (Fabric) in Your Android Application](#enabling-the-new-renderer-fabric-in-your-android-application). Plus we will also assume that you followed the instructions from [Enabling the New NativeModule System (TurboModule) in Your Android Application](#enabling-the-new-nativemodule-system-turbomodule-in-your-android-application) as the Makefile (`Android.mk`) and other native builds setup steps are presented over there and won’t be repeated here. +First, make sure you followed the instructions to [Enabling the New Renderer (Fabric) in Your Android Application](#enabling-the-new-renderer-fabric-in-your-android-application). Plus we will also assume that you followed the instructions from [Enabling the New NativeModule System (TurboModule) in Your Android Application](#enabling-the-new-nativemodule-system-turbomodule-in-your-android-application) as the native builds setup steps are presented over there and won’t be repeated here. ### JavaScript changes diff --git a/website/versioned_docs/version-0.70/new-architecture-library-android.md b/website/versioned_docs/version-0.70/new-architecture-library-android.md index 565546a12d0..09f1ee2fb7f 100644 --- a/website/versioned_docs/version-0.70/new-architecture-library-android.md +++ b/website/versioned_docs/version-0.70/new-architecture-library-android.md @@ -34,6 +34,7 @@ app/build/generated/source/codegen │ └── NativeAwesomeManagerSpec.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── react │ │ └── renderer │ │ └── components From 9e6e3116966e2b9ba6208bfd8ff2bb19ccff1983 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 8 Sep 2022 12:55:43 +0100 Subject: [PATCH 4/4] Follow-up on CMake clarification for 0.70 (#3309) --- .../version-0.70/the-new-architecture/pillars-codegen.md | 1 + .../version-0.70/the-new-architecture/pillars-turbomodule.md | 1 + 2 files changed, 2 insertions(+) diff --git a/website/versioned_docs/version-0.70/the-new-architecture/pillars-codegen.md b/website/versioned_docs/version-0.70/the-new-architecture/pillars-codegen.md index c55db88d267..11bd5062190 100644 --- a/website/versioned_docs/version-0.70/the-new-architecture/pillars-codegen.md +++ b/website/versioned_docs/version-0.70/the-new-architecture/pillars-codegen.md @@ -162,6 +162,7 @@ codegen │ └── MyTurbomodule.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── MyTurbomodule-generated.cpp │ ├── MyTurbomodule.h │ └── react diff --git a/website/versioned_docs/version-0.70/the-new-architecture/pillars-turbomodule.md b/website/versioned_docs/version-0.70/the-new-architecture/pillars-turbomodule.md index 9ccd7a9820f..77159a4fc24 100644 --- a/website/versioned_docs/version-0.70/the-new-architecture/pillars-turbomodule.md +++ b/website/versioned_docs/version-0.70/the-new-architecture/pillars-turbomodule.md @@ -497,6 +497,7 @@ codegen │ └── NativeCalculatorSpec.java ├── jni │ ├── Android.mk +│ ├── CMakeLists.txt │ ├── RTNCalculator-generated.cpp │ ├── RTNCalculator.h │ └── react