From 3ebe198bd514fbc780c2c2d7a7684ed3b9dc8f65 Mon Sep 17 00:00:00 2001
From: Mihail Marinov <m.marinov@samsung.com>
Date: Wed, 16 Nov 2016 15:45:24 -0800
Subject: [PATCH] Include 64bit binaries only when the custom ARM64 property is
 defined

GearVRf-DCO-1.0-Signed-off-by: Mihail Marinov <m.marinov@samsung.com>
---
 common.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common.gradle b/common.gradle
index 33adbb556..f15e9865d 100644
--- a/common.gradle
+++ b/common.gradle
@@ -37,6 +37,9 @@ android {
     packagingOptions {
         exclude 'lib/x86/libgvrbase.so'
         exclude 'lib/arm64-v8a/libgvrbase.so'
+        if (!rootProject.hasProperty("ARM64")) {
+            exclude 'lib/arm64-v8a/*.so'
+        }
     }
 }