mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
TM iOS: refactor header dir for TM
Summary: For better cocoapods compatibility, refactored TM podspec to be a subspec of ReactCommon, then use `<ReactCommon/` header prefix for all TM files. Relevant efforts: https://github.com/facebook/react-native/pull/25619 https://github.com/facebook/react-native/pull/25393 Reviewed By: hramos Differential Revision: D16231697 fbshipit-source-id: 38d3418b19978ff54aa0c61b064ac45ac0e1c36c
This commit is contained in:
committed by
Facebook Github Bot
parent
1914d9a4c0
commit
6e7ce9c082
@@ -8,7 +8,7 @@ LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
# Header search path for all source files in this module.
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/jsireact
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
|
||||
|
||||
# Header search path for modules that depend on this module
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
@@ -22,8 +22,8 @@ LOCAL_SHARED_LIBRARIES = libfb
|
||||
# Name of this module.
|
||||
LOCAL_MODULE := jscallinvokerholder
|
||||
|
||||
# Compile all local c++ files under ./platform/android/jsireact
|
||||
LOCAL_SRC_FILES := $(LOCAL_PATH)/jsireact/JSCallInvokerHolder.cpp
|
||||
# Compile all local c++ files
|
||||
LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/JSCallInvokerHolder.cpp
|
||||
|
||||
# Build the files in this directory as a shared library
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
@@ -3,13 +3,13 @@ load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "
|
||||
rn_xplat_cxx_library(
|
||||
name = "jni",
|
||||
srcs = [
|
||||
"jsireact/OnLoad.cpp",
|
||||
"jsireact/TurboModuleManager.cpp",
|
||||
"ReactCommon/OnLoad.cpp",
|
||||
"ReactCommon/TurboModuleManager.cpp",
|
||||
],
|
||||
header_namespace = "",
|
||||
exported_headers = {
|
||||
"jsireact/TurboModuleManager.h": "jsireact/TurboModuleManager.h",
|
||||
"jsireact/TurboModuleManagerDelegate.h": "jsireact/TurboModuleManagerDelegate.h",
|
||||
"ReactCommon/TurboModuleManager.h": "ReactCommon/TurboModuleManager.h",
|
||||
"ReactCommon/TurboModuleManagerDelegate.h": "ReactCommon/TurboModuleManagerDelegate.h",
|
||||
},
|
||||
compiler_flags = [
|
||||
"-fexceptions",
|
||||
@@ -40,11 +40,11 @@ rn_xplat_cxx_library(
|
||||
rn_xplat_cxx_library(
|
||||
name = "jscallinvokerholder",
|
||||
srcs = [
|
||||
"jsireact/JSCallInvokerHolder.cpp",
|
||||
"ReactCommon/JSCallInvokerHolder.cpp",
|
||||
],
|
||||
header_namespace = "",
|
||||
exported_headers = {
|
||||
"jsireact/JSCallInvokerHolder.h": "jsireact/JSCallInvokerHolder.h",
|
||||
"ReactCommon/JSCallInvokerHolder.h": "ReactCommon/JSCallInvokerHolder.h",
|
||||
},
|
||||
compiler_flags = [
|
||||
"-fexceptions",
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include <fb/fbjni.h>
|
||||
#include <jsi/jsi.h>
|
||||
|
||||
#include <jsireact/TurboModuleBinding.h>
|
||||
#include <jsireact/TurboCxxModule.h>
|
||||
#include <ReactCommon/TurboModuleBinding.h>
|
||||
#include <ReactCommon/TurboCxxModule.h>
|
||||
#include <react/jni/JMessageQueueThread.h>
|
||||
|
||||
#include "TurboModuleManager.h"
|
||||
+4
-4
@@ -10,12 +10,12 @@
|
||||
#include <memory>
|
||||
#include <fb/fbjni.h>
|
||||
#include <jsi/jsi.h>
|
||||
#include <jsireact/TurboModule.h>
|
||||
#include <jsireact/JavaTurboModule.h>
|
||||
#include <ReactCommon/TurboModule.h>
|
||||
#include <ReactCommon/JavaTurboModule.h>
|
||||
#include <react/jni/CxxModuleWrapper.h>
|
||||
#include <react/jni/JMessageQueueThread.h>
|
||||
#include <jsireact/JSCallInvokerHolder.h>
|
||||
#include <jsireact/TurboModuleManagerDelegate.h>
|
||||
#include <ReactCommon/JSCallInvokerHolder.h>
|
||||
#include <ReactCommon/TurboModuleManagerDelegate.h>
|
||||
|
||||
namespace facebook {
|
||||
namespace react {
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <fb/fbjni.h>
|
||||
#include <jsireact/JavaTurboModule.h>
|
||||
#include <ReactCommon/JavaTurboModule.h>
|
||||
#include <jsireact/JSCallInvoker.h>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
Reference in New Issue
Block a user