From 6eba2f145ea892409fedba178e90d19721858cb7 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Fri, 28 Feb 2020 09:20:35 -0800
Subject: [PATCH] Properly fetch project properties (#2185)

---
 android/build.gradle                                   | 2 +-
 android/buildSrc/src/main/groovy/FilamentPlugin.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index e969c24663..dbcbb69688 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -13,7 +13,7 @@
 buildscript {
     def filamentPath = file("../out/android-release/filament").absolutePath
     if (project.hasProperty("filament_dist_dir")) {
-        filamentPath = file("$filament_dist_dir").absolutePath
+        filamentPath = file(project.property("filament_dist_dir")).absolutePath
     }
 
     // Our minSdkVersion is actually 19, we lie and say 14 here so apps don't have
diff --git a/android/buildSrc/src/main/groovy/FilamentPlugin.groovy b/android/buildSrc/src/main/groovy/FilamentPlugin.groovy
index a4cf02f7b7..8e5af17e28 100644
--- a/android/buildSrc/src/main/groovy/FilamentPlugin.groovy
+++ b/android/buildSrc/src/main/groovy/FilamentPlugin.groovy
@@ -251,7 +251,7 @@ class FilamentToolsPlugin implements Plugin<Project> {
 
         project.ext.filamentToolsPath = project.file("../../../out/release/filament")
         if (project.hasProperty("filament_tools_dir")) {
-            project.ext.filamentToolsPath = project.file("$filament_tools_dir")
+            project.ext.filamentToolsPath = project.file(project.property("filament_tools_dir"))
         }
 
         project.tasks.register("filamentCompileMaterials", MaterialCompiler) {