From 4072b1865a9742d5eb81bc6d4831a185796f95c7 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 25 Sep 2020 22:12:29 -0700
Subject: [PATCH] TurboModule Android: rename libreact_nativemodule_manager to
 libturbomodulejsijni

Summary:
TurboModule Java files are still using the old lib name: `turbomodulejsijni`, so let's keep it that way for now.

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23946945

fbshipit-source-id: ff095ff51dca532c82e67e1c75e9a4e9be392d61
---
 ReactAndroid/Android-prebuilt.mk                            | 6 +++---
 .../java/com/facebook/react/turbomodule/core/jni/Android.mk | 3 ++-
 packages/rn-tester/android/app/src/main/jni/Android.mk      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 338d8def835..4a4fb45ee1f 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -74,10 +74,10 @@ LOCAL_EXPORT_C_INCLUDES := \
 LOCAL_SHARED_LIBRARIES := libfolly_json
 include $(PREBUILT_SHARED_LIBRARY)
 
-# react_nativemodule_manager
+# turbomodulejsijni
 include $(CLEAR_VARS)
-LOCAL_MODULE := react_nativemodule_manager
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_manager.so
+LOCAL_MODULE := turbomodulejsijni
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libturbomodulejsijni.so
 LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
 include $(PREBUILT_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
index ba788dafca2..955cc86a8b1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -39,7 +39,8 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 # Name of this module.
-LOCAL_MODULE := react_nativemodule_manager
+# TODO: rename to react_nativemodule_manager
+LOCAL_MODULE := turbomodulejsijni
 
 # Header search path for all source files in this module.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
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 176de4fd675..2029b87348d 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -15,7 +15,7 @@ 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 libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libturbomodulejsijni libreact_codegen_reactandroidspec
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall