From 975b52d26b90f2c6d868dd47bb2c292cab76dac9 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 3 Oct 2019 04:38:08 -0700 Subject: [PATCH] Build with static libc++ Summary: This avoids having to perform gymnastics like in https://github.com/facebook/react-native/pull/26697 Reviewed By: jknoxville Differential Revision: D17735954 fbshipit-source-id: 507548aab89309beeb228b104a24af8acd10ce9a --- android/build.gradle | 2 +- xplat/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 4f7f1a1cc..c4d1d0f16 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ android { externalNativeBuild { cmake { - arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' + arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static' targets 'flipper', 'event_shared', 'event_extra_shared', 'event_core_shared' } } diff --git a/xplat/build.gradle b/xplat/build.gradle index a5d95b410..b6c36429f 100644 --- a/xplat/build.gradle +++ b/xplat/build.gradle @@ -16,7 +16,7 @@ android { targetSdkVersion rootProject.targetSdkVersion externalNativeBuild { cmake { - arguments '-DANDROID_TOOLCHAIN=clang' + arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static' } } }