From 1d86be3a6eb12bd51c21cd324978d07cfd97a8ef Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Sun, 3 Jul 2016 14:39:45 -0700
Subject: [PATCH] Turned on old bridge for OSS

Summary:
This should revert back to using old bridge by default until we fix gradle script to build new bridge for OSS correctly
Closes https://github.com/facebook/react-native/pull/8539

Differential Revision: D3514263

Pulled By: bestander

fbshipit-source-id: db9e0232b9bde27206814212dedc487c366e3511
---
 .../Utilities/createStrictShapeTypeChecker.js   | 17 ++++++++---------
 .../react/testing/ReactAppTestActivity.java     |  1 +
 .../com/facebook/react/ReactNativeHost.java     |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js
index fcf909bef..b5fe14a1b 100644
--- a/Libraries/Utilities/createStrictShapeTypeChecker.js
+++ b/Libraries/Utilities/createStrictShapeTypeChecker.js
@@ -46,15 +46,14 @@ function createStrictShapeTypeChecker(
     var allKeys = merge(props[propName], shapeTypes);
     for (var key in allKeys) {
       var checker = shapeTypes[key];
-      invariant(
-        checker,
-        'Invalid props.%s key `%s` supplied to `%s`.\nBad object: %s\nValid keys: %s',
-        propName,
-        key,
-        componentName,
-        JSON.stringify(props[propName], null, '  '),
-        JSON.stringify(Object.keys(shapeTypes).sort(), null, '  '),
-      );
+      if (!checker) {
+        invariant(
+          false,
+          `Invalid props.${propName} key \`${key}\` supplied to \`${componentName}\`.` +
+            `\nBad object: ` + JSON.stringify(props[propName], null, '  ') +
+            `\nValid keys: ` + JSON.stringify(Object.keys(shapeTypes), null, '  ')
+        );
+      }
       var error = checker(propValue, key, componentName, location);
       if (error) {
         invariant(
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 37f0a4db3..592324e26 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -153,6 +153,7 @@ public class ReactAppTestActivity extends FragmentActivity implements
     ReactInstanceManager.Builder builder =
       ReactTestHelper.getReactTestFactory().getReactInstanceManagerBuilder()
         .setApplication(getApplication())
+        .setUseOldBridge(true)
         .setBundleAssetName(bundleName)
         // By not setting a JS module name, we force the bundle to be always loaded from
         // assets, not the devserver, even if dev mode is enabled (such as when testing redboxes).
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index b30202442..54e893f1e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -61,6 +61,7 @@ public abstract class ReactNativeHost {
 
   protected ReactInstanceManager createReactInstanceManager() {
     ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
+      .setUseOldBridge(true)
       .setApplication(mApplication)
       .setJSMainModuleName(getJSMainModuleName())
       .setUseDeveloperSupport(getUseDeveloperSupport())