From fd5f544f8fe03ff7904bbba08338f4aac9cd4ca7 Mon Sep 17 00:00:00 2001
From: Jordan Marshall <JordanMarshall@users.noreply.github.com>
Date: Mon, 15 Jun 2020 09:11:50 -0600
Subject: [PATCH] [Student][R-6.8.0] Set up NDK filters to only support
 armabi-v7a, arm64-v8a, and x86_64 (#854)

---
 apps/student/build.gradle | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index fdd924d41d..ed1e98438f 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -53,7 +53,7 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 212
+        versionCode = 213
         versionName = '6.8.0'
 
         vectorDrawables.useSupportLibrary = true
@@ -116,6 +116,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             ext.enableCrashlytics = false
             pseudoLocalesEnabled true
+
+            ndk {
+                // Filter for architectures supported by Flutter. Include x86 in debug builds so we don't crash on FTL.
+                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64', 'x86'
+            }
         }
 
         release {
@@ -125,6 +130,11 @@ android {
             shrinkResources true
             buildConfigField 'boolean', 'IS_DEBUG', 'false'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+
+            ndk {
+                // Filter for architectures supported by Flutter. Exclude x86 in release builds to avoid missing lib crash on x86 devices.
+                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+            }
         }
     }