From 021a63d4da29c2ab6f2f575761d97c1e3645adac Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 7 Oct 2019 14:53:29 -0700 Subject: [PATCH] Ensure internal builds don't use plugin stubs Summary: We generate a stub for plugin system, so that TurboModules can work in OSS. Unless the `RN_DISABLE_OSS_PLUGIN_HEADER` define is seet, TurboModules will use the plugin stub. Therefore, for internal builds, we should set this define. Reviewed By: fkgozali, mdvacca Differential Revision: D17789993 fbshipit-source-id: a93735738513457236adb3064b80601053c95dd3 --- Libraries/Blob/RCTBlobPlugins.h | 4 ++-- Libraries/CameraRoll/RCTCameraRollPlugins.h | 4 ++-- Libraries/Settings/RCTSettingsPlugins.h | 4 ++-- Libraries/Vibration/RCTVibrationPlugins.h | 4 ++-- React/CoreModules/BUCK | 1 + React/CoreModules/CoreModulesPlugins.h | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Libraries/Blob/RCTBlobPlugins.h b/Libraries/Blob/RCTBlobPlugins.h index 9c42a627853..a157c429388 100644 --- a/Libraries/Blob/RCTBlobPlugins.h +++ b/Libraries/Blob/RCTBlobPlugins.h @@ -9,8 +9,8 @@ #ifdef RN_DISABLE_OSS_PLUGIN_HEADER -// FB Internal: Plugins.h is autogenerated by the build system. -#import "Plugins.h" +// FB Internal: FBRCTBlobPlugins.h is autogenerated by the build system. +#import "FBRCTBlobPlugins.h" #else diff --git a/Libraries/CameraRoll/RCTCameraRollPlugins.h b/Libraries/CameraRoll/RCTCameraRollPlugins.h index 2b0c3ca8770..d61c7dd5243 100644 --- a/Libraries/CameraRoll/RCTCameraRollPlugins.h +++ b/Libraries/CameraRoll/RCTCameraRollPlugins.h @@ -9,8 +9,8 @@ #ifdef RN_DISABLE_OSS_PLUGIN_HEADER -// FB Internal: Plugins.h is autogenerated by the build system. -#import "Plugins.h" +// FB Internal: FBRCTCameraRollPlugins.h is autogenerated by the build system. +#import "FBRCTCameraRollPlugins.h" #else diff --git a/Libraries/Settings/RCTSettingsPlugins.h b/Libraries/Settings/RCTSettingsPlugins.h index e4f3f57bbc6..92314e29fad 100644 --- a/Libraries/Settings/RCTSettingsPlugins.h +++ b/Libraries/Settings/RCTSettingsPlugins.h @@ -9,8 +9,8 @@ #ifdef RN_DISABLE_OSS_PLUGIN_HEADER -// FB Internal: Plugins.h is autogenerated by the build system. -#import "Plugins.h" +// FB Internal: FBRCTSettingsPlugins.h is autogenerated by the build system. +#import "FBRCTSettingsPlugins.h" #else diff --git a/Libraries/Vibration/RCTVibrationPlugins.h b/Libraries/Vibration/RCTVibrationPlugins.h index f56cb0a40fc..9ce2e77c21c 100644 --- a/Libraries/Vibration/RCTVibrationPlugins.h +++ b/Libraries/Vibration/RCTVibrationPlugins.h @@ -9,8 +9,8 @@ #ifdef RN_DISABLE_OSS_PLUGIN_HEADER -// FB Internal: Plugins.h is autogenerated by the build system. -#import "Plugins.h" +// FB Internal: FBRCTVibrationPlugins.h is autogenerated by the build system. +#import "FBRCTVibrationPlugins.h" #else diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK index a1c5ab7e6ae..2128fab5a96 100644 --- a/React/CoreModules/BUCK +++ b/React/CoreModules/BUCK @@ -70,6 +70,7 @@ rn_apple_library( name = "ActionSheetManager", native_class_func = "RCTActionSheetManagerCls", ), + plugins_header = "FBCoreModulesPlugins.h", preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_extra_build_flags() + [ "-DRN_DISABLE_OSS_PLUGIN_HEADER", ], diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h index 53655db53f3..6eb37cc375d 100644 --- a/React/CoreModules/CoreModulesPlugins.h +++ b/React/CoreModules/CoreModulesPlugins.h @@ -9,8 +9,8 @@ #ifdef RN_DISABLE_OSS_PLUGIN_HEADER -// FB Internal: Plugins.h is autogenerated by the build system. -#import "Plugins.h" +// FB Internal: FBCoreModulesPlugins.h is autogenerated by the build system. +#import "FBCoreModulesPlugins.h" #else