From 167792e7d83ff43eb07bfeb70dd79b9f583f950f Mon Sep 17 00:00:00 2001
From: Pascal Hartig <phartig@rdrei.net>
Date: Fri, 29 Jun 2018 06:33:31 -0700
Subject: [PATCH] Remove NDK build from fbjni sub-project (#116)

Summary:
We're already building this as dependency via CMake of sonar itself and
bundle the resulting `.so` files in there.

This project only contains the java files so we can ship them as
separate JAR.

Importantly, this avoids having to use `pickFirst` as we bundle multiple
incompatible `.so` files in both AARs.
Closes https://github.com/facebook/Sonar/pull/116

Reviewed By: priteshrnandgaonkar

Differential Revision: D8691119

Pulled By: passy

fbshipit-source-id: 82303d6c2b5d7e12dcd8f49300090ce8e4570e47
---
 android/sample/build.gradle |  7 -------
 libs/fbjni/build.gradle     | 14 --------------
 2 files changed, 21 deletions(-)

diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index d71f90f3f..6ff674fd7 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -24,13 +24,6 @@ android {
             }
         }
     }
-
-   packagingOptions {
-        pickFirst 'lib/armeabi-v7a/libsonarfb.so'
-        pickFirst 'lib/x86/libsonarfb.so'
-        pickFirst 'lib/x86_64/libsonarfb.so'
-        pickFirst 'lib/arm64-v8a/libsonarfb.so'
-    }
 }
 
 
diff --git a/libs/fbjni/build.gradle b/libs/fbjni/build.gradle
index fcfe6149f..c2469fefd 100644
--- a/libs/fbjni/build.gradle
+++ b/libs/fbjni/build.gradle
@@ -15,20 +15,6 @@ android {
                 }
             }
         }
-        ndk {
-            abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
-        }
-
-        externalNativeBuild {
-            cmake {
-                arguments '-DANDROID_TOOLCHAIN=clang'
-            }
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path './CMakeLists.txt'
-        }
     }
 }