Properly fetch project properties (google#2185)

daichen · Feb 28, 2020 · 6eba2f1 · 6eba2f1
1 parent 1366602
commit 6eba2f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {