mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
don't include duplicate RCTDefines.h
Summary: RCTDefines.h belongs to two modules at once, which is causing include issues. Make it only part of the RCTDefines target and modify includes to find it correctly. Changelog: [Internal] Reviewed By: ksying, javache Differential Revision: D100817032 fbshipit-source-id: a665271c941114f4c9cbc10ccaac2d750aebabf1
This commit is contained in:
1 parent
a6f2697f72
commit
a6df56e22e
10 files changed
+14
-10
No files matched your search
@@ -7,8 +7,9 @@
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#import <React/RCTDefines.h>
|
||||
|
||||
#import "RCTBundleManager.h"
|
||||
#import "RCTDefines.h"
|
||||
|
||||
RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
|
||||
RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#import "RCTSurfaceRootView.h"
|
||||
|
||||
#import "RCTDefines.h"
|
||||
#import <React/RCTDefines.h>
|
||||
|
||||
@implementation RCTSurfaceRootView
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
#import "RCTSurfaceView.h"
|
||||
#import "RCTSurfaceView+Internal.h"
|
||||
|
||||
#import "RCTDefines.h"
|
||||
#import <React/RCTDefines.h>
|
||||
|
||||
#import "RCTSurface.h"
|
||||
#import "RCTSurfaceProtocol.h"
|
||||
#import "RCTSurfaceRootView.h"
|
||||
|
||||
+3
-1
@@ -6,8 +6,10 @@
|
||||
*/
|
||||
|
||||
#import "RCTSurfaceHostingView.h"
|
||||
|
||||
#import <React/RCTDefines.h>
|
||||
|
||||
#import "RCTConstants.h"
|
||||
#import "RCTDefines.h"
|
||||
#import "RCTSurface.h"
|
||||
#import "RCTSurfaceDelegate.h"
|
||||
#import "RCTSurfaceView.h"
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#import "RCTUIManager.h"
|
||||
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
#import <React/RCTDefines.h>
|
||||
#import <React/RCTSurfacePresenterStub.h>
|
||||
#import <react/featureflags/ReactNativeFeatureFlags.h>
|
||||
|
||||
@@ -17,7 +18,6 @@
|
||||
#import "RCTComponent.h"
|
||||
#import "RCTComponentData.h"
|
||||
#import "RCTConvert.h"
|
||||
#import "RCTDefines.h"
|
||||
#import "RCTEventDispatcherProtocol.h"
|
||||
#import "RCTLayoutAnimation.h"
|
||||
#import "RCTLayoutAnimationGroup.h"
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
#import <objc/runtime.h>
|
||||
#import <stdatomic.h>
|
||||
|
||||
#import <React/RCTDefines.h>
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
#import "RCTAssert.h"
|
||||
#import "RCTBridge+Private.h"
|
||||
#import "RCTBridge.h"
|
||||
#import "RCTComponentData.h"
|
||||
#import "RCTDefines.h"
|
||||
#import "RCTLog.h"
|
||||
#import "RCTModuleData.h"
|
||||
#import "RCTReloadCommand.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#include "RCTDefines.h"
|
||||
#include <React/RCTDefines.h>
|
||||
#include "RCTMacros.h"
|
||||
|
||||
#if RCT_PROFILE && defined(__arm__)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#include "RCTDefines.h"
|
||||
#include <React/RCTDefines.h>
|
||||
#include "RCTMacros.h"
|
||||
|
||||
#if RCT_PROFILE && defined(__arm64__)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#include "RCTDefines.h"
|
||||
#include <React/RCTDefines.h>
|
||||
#include "RCTMacros.h"
|
||||
|
||||
#if RCT_PROFILE && defined(__i386__)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#include "RCTDefines.h"
|
||||
#include <React/RCTDefines.h>
|
||||
#include "RCTMacros.h"
|
||||
|
||||
#if RCT_PROFILE && defined(__x86_64__)
|
||||
|
||||
Reference in new issue
Block a user