commit 7091154369c595780cf08047a1550916eaf7eea4
author Christian Forfang <cforfang@users.noreply.github.com> Thu May 04 15:26:51 2017 +0200
committer Cody Northrop <cnorthrop@google.com> Thu May 04 10:11:23 2017 -0600
tree 27c30781875966c1b310bb51b5decd83552dea37
parent 7d11b8ea0482f94682491d45221f389d55a127be

Fix location of vk_layer_settings.txt on Android

Commit 969ab0680dd434f0 ('api_dump: Support config file and logging on Android')
added a custom location for vk_layer_settings.txt on Android. However, commit
750837a5dedf524c81c (Merge branch 'trunk') ended up partly overwriting these changes,
breaking the functionality.

As a result, using the config file on Android hasn't worked since October 2016. This commit
restores the changes in the original commit to fix this.

layers/vk_layer_config.cpp

diff --git a/layers/vk_layer_config.cpp b/layers/vk_layer_config.cpp
index ffefbcd..1f32eff 100644
--- a/layers/vk_layer_config.cpp
+++ b/layers/vk_layer_config.cpp
@@ -192,7 +192,7 @@
             }
             parseFile(envPath.c_str());
         } else {
-            parseFile("vk_layer_settings.txt");
+            parseFile(m_fileName.c_str());
         }
     }
 
@@ -215,7 +215,7 @@
             }
             parseFile(envPath.c_str());
         } else {
-            parseFile("vk_layer_settings.txt");
+            parseFile(m_fileName.c_str());
         }
     }