fix: attemp to fix android autolink error

Author: nutstick

android/build.gradle

@@ -1,14 +1,9 @@
 import java.nio.file.Paths
 
 buildscript {
-    ext.safeExtGet = {prop, fallback ->
-        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-    }
-
     repositories {
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
 
     dependencies {
@@ -30,35 +25,32 @@ if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }
 
-android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 30)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.3')
+def getExtOrDefault(name, defaultValue) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : defaultValue
+}
 
-    // Used to override the NDK path/version on internal CI or by allowing
-    // users to customize the NDK path/version from their root project (e.g. for M1 support)
-    if (rootProject.hasProperty("ndkPath")) {
-        ndkPath rootProject.ext.ndkPath
-    }
-    if (rootProject.hasProperty("ndkVersion")) {
-        ndkVersion rootProject.ext.ndkVersion
-    }
+android {
+    compileSdkVersion getExtOrDefault('compileSdkVersion', 30)
+    buildToolsVersion getExtOrDefault('buildToolsVersion', '29.0.3')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 31)
+        minSdkVersion getExtOrDefault('minSdkVersion', 21)
+        targetSdkVersion getExtOrDefault('targetSdkVersion', 31)
+        versionCode 1
+        versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
 
     lintOptions {
         abortOnError false
     }
 
-
     sourceSets.main {
         java {
             if (isNewArchitectureEnabled()) {
                 srcDirs += [
                     "src/fabric/java",
+                    "${project.buildDir}/generated/source/codegen/java"
                 ]
             } else {
                 srcDirs += [
@@ -70,6 +62,7 @@ android {
 }
 
 repositories {
+    google()
     mavenCentral()
 }
 

common/cpp/Android.mk

@@ -0,0 +1,46 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/progressview/*.cpp)
+
+add_library(
+  react_codegen_progressview
+  SHARED
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_progressview PUBLIC . react/renderer/components/progressview)
+
+target_link_libraries(
+  react_codegen_progressview
+  fbjni
+  folly_runtime
+  glog
+  jsi
+  react_codegen_rncore
+  react_debug
+  react_nativemodule_core
+  react_render_core
+  react_render_mapbuffer
+  react_render_imagemanager
+  react_render_debug
+  react_render_graphics
+  rrc_view
+  turbomodulejsijni
+  yoga
+)
+
+target_compile_options(
+  react_codegen_progressview
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++17
+  -Wall
+)

common/cpp/CMakeLists.txt

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <jsi/jsi.h>
 #include <react/renderer/components/progressview/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/components/view/ViewEventEmitter.h>
@@ -12,12 +13,12 @@
 namespace facebook {
 namespace react {
 
-extern const char RNCProgressViewComponentName[];
+JSI_EXPORT extern const char RNCProgressViewComponentName[];
 
 /*
  * `ShadowNode` for <RNCProgressView> component.
  */
-class RNCProgressViewShadowNode final : public ConcreteViewShadowNode<
+JSI_EXPORT class RNCProgressViewShadowNode final : public ConcreteViewShadowNode<
                                             RNCProgressViewComponentName,
                                             RNCProgressViewProps,
                                             ViewEventEmitter,

common/cpp/react/renderer/components/progressview/RNCProgressViewShadowNode.h

@@ -15,7 +15,7 @@ namespace react {
 /*
  * State for <RNCProgressView> component.
  */
-class RNCProgressViewState final {
+class JSI_EXPORT RNCProgressViewState final {
  public:
   RNCProgressViewState(
       ImageSource const &progressImageSource,

common/cpp/react/renderer/components/progressview/RNCProgressViewState.h

@@ -63,4 +63,5 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.176.3
+^0.182.0
+

fabric-example/.flowconfig

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+.cxx/
 
 # Android/IntelliJ
 #

fabric-example/.gitignore

@@ -0,0 +1 @@
+16

fabric-example/.node-version

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -142,22 +143,14 @@ android {
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            // We configure the CMake build only if you decide to opt-in for the New Architecture.
             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"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "fabricexample_appmodules"
+                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"
                 }
             }
             if (!enableSeparateBuildPerCPUArchitecture) {
@@ -171,8 +164,8 @@ android {
     if (isNewArchitectureEnabled()) {
         // We configure the NDK build only if you decide to opt-in for the New Architecture.
         externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
+            cmake {
+                path "$projectDir/src/main/jni/CMakeLists.txt"
             }
         }
         def reactAndroidProjectDir = project(':ReactAndroid').projectDir
@@ -194,15 +187,15 @@ android {
             preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
 
             // Due to a bug inside AGP, we have to explicitly set a dependency
-            // between configureNdkBuild* tasks and the preBuild tasks.
+            // between configureCMakeDebug* tasks and the preBuild tasks.
             // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-            configureNdkBuildRelease.dependsOn(preReleaseBuild)
-            configureNdkBuildDebug.dependsOn(preDebugBuild)
+            configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
+            configureCMakeDebug.dependsOn(preDebugBuild)
             reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
                     dependsOn("preDebugBuild")
                 }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
                     dependsOn("preReleaseBuild")
                 }
             }