From ab4c73c30cbaf24b3f7b5a7d87fda8e5383d1ac7 Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Tue, 8 Mar 2016 13:16:40 -0800 Subject: [PATCH] Compensate for different versions of folly for open source build Summary: ReactAndroid will need to use the deprecated version of folly::dynamic for the time being. Reviewed By: bestander Differential Revision: D3025433 fb-gh-sync-id: fee6beb65d5d0c449f1a08a0d3c593b788905001 shipit-source-id: fee6beb65d5d0c449f1a08a0d3c593b788905001 --- ReactAndroid/src/main/jni/react/jni/BUCK | 1 + ReactAndroid/src/main/jni/react/jni/OnLoad.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index 34c030641..419cde76b 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -69,6 +69,7 @@ jni_library( compiler_flags = [ '-Wall', '-Werror', + '-Wno-deprecated-declarations', '-fexceptions', '-std=c++11', '-fvisibility=hidden', diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 41b67602e..6dc5a0ca1 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -233,7 +233,7 @@ struct WritableNativeArray static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/WritableNativeArray;"; WritableNativeArray() - : HybridBase(folly::dynamic::array) {} + : HybridBase(folly::dynamic({})) {} static local_ref initHybrid(alias_ref) { return makeCxxInstance();