From c2b1f09c84443ef56115931693af3946b0b4ac3f Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Wed, 13 Jun 2018 16:37:15 +0100
Subject: [PATCH] OpenSSL builds successfully

---
 android/build.gradle                     | 12 +++++++++---
 android/third-party/OpenSSL/build.gradle |  8 +++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index ee3efdde2..608a0facf 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -134,19 +134,25 @@ task downloadOpenSSL(dependsOn: [], type: Download) {
 
 task prepareOpenSSL(dependsOn: [downloadOpenSSL], type: Copy) {
     from tarTree(downloadOpenSSL.dest)
-    from './third-party/OpenSSL/'
-    include 'openssl-android-1.0.0/**/*', 'build.gradle', 'ApplicationManifest.xml'
+    include 'openssl-android-1.0.0/**/*'
     includeEmptyDirs = false
     into "$thirdPartyNdkDir/OpenSSL/"
 }
 
+task finalizeOpenSSL(dependsOn: [prepareOpenSSL], type: Copy) {
+    from './third-party/OpenSSL/'
+    include 'build.gradle', 'ApplicationManifest.xml'
+    includeEmptyDirs = false
+    into "$thirdPartyNdkDir/OpenSSL/openssl-android-1.0.0/"
+}
+
 task prepareAllLibs() {
     dependsOn finalizeGlog
     dependsOn prepareDoubleConversion
     dependsOn prepareBoost
     dependsOn prepareFolly
     dependsOn finalizeEvent
-    dependsOn prepareOpenSSL
+    dependsOn finalizeOpenSSL
 }
 
 android {
diff --git a/android/third-party/OpenSSL/build.gradle b/android/third-party/OpenSSL/build.gradle
index 4f969db72..5f6b89ba2 100644
--- a/android/third-party/OpenSSL/build.gradle
+++ b/android/third-party/OpenSSL/build.gradle
@@ -8,15 +8,14 @@ android {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         ndk {
-            abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a' 'x86_64'
+            abiFilters 'x86', 'arm64-v8a'
         }
 
         externalNativeBuild {
             ndkBuild {
             arguments "NDK_APPLICATION_MK:=$projectDir/jni/Application.mk",
-                      "NDK_TOOLCHAIN_VERSION:=clang",
-                      "NDK_PROJECT_PATH:=openssl-android-1.0.0"
-            cppFlags "-fPIC"
+                      "NDK_TOOLCHAIN_VERSION:=clang"
+            cppFlags "-std=c++11"
             }
         }
     }
@@ -34,4 +33,3 @@ android {
         }
     }
 }
-#abiFilters 'x86', 'arm64-v8a', 'x86_64'