From c8134422a82c57e2a5b4f6cf50cd92b0fa679e19 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 21 Aug 2020 19:57:58 -0700
Subject: Updated Android build files

---
 NativeApp/Android/android_common.gradle |  2 ++
 NativeApp/Android/build.gradle          | 12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'NativeApp/Android')

diff --git a/NativeApp/Android/android_common.gradle b/NativeApp/Android/android_common.gradle
index 5be7b80..0783e79 100644
--- a/NativeApp/Android/android_common.gradle
+++ b/NativeApp/Android/android_common.gradle
@@ -10,3 +10,5 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 }
+
+buildDir "${project.rootDir}/build/${project.name}"
diff --git a/NativeApp/Android/build.gradle b/NativeApp/Android/build.gradle
index 34d1d5c..36b08d6 100644
--- a/NativeApp/Android/build.gradle
+++ b/NativeApp/Android/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'com.android.library'
 apply from: "android_common.gradle"
 
-buildDir './build'
-
 // The arcore aar library contains the native shared libraries.  These are
 // extracted before building to a temporary directory.
 def arcore_libpath = "${buildDir}/arcore-native"
@@ -45,11 +43,9 @@ android {
 configurations { natives }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     // ARCore library
-    implementation 'com.google.ar:core:1.16.0'
-    natives 'com.google.ar:core:1.16.0'
+    implementation 'com.google.ar:core:1.18.0'
+    natives 'com.google.ar:core:1.18.0'
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
 }
@@ -57,7 +53,7 @@ dependencies {
 
 // Extracts the shared libraries from aars in the natives configuration.
 // This is done so that NDK builds can access these libraries.
-task extractNativeLibraries() {
+task extractARCoreLibraries() {
     // Always extract, this insures the native libs are updated if the version changes.
     outputs.upToDateWhen { false }
     doFirst {
@@ -73,6 +69,6 @@ task extractNativeLibraries() {
 
 tasks.whenTaskAdded {
     task-> if (task.name.contains("external") && !task.name.contains("Clean")) {
-        task.dependsOn(extractNativeLibraries)
+        task.dependsOn(extractARCoreLibraries)
     }
 }
-- 
cgit v1.2.3