commit 5649b31a177f98e0f6601ec03c0e0b4fc0ae07e0
author Mark Salyzyn <salyzyn@google.com> Wed Mar 22 08:46:55 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Apr 25 15:08:56 2017 -0700
tree 5986f73ac3ac4d50b4129efc7fcd6f8e66dca4f6
parent 5aada52ffbf2924e6117f87efddddce340cc1af8

fs_config_generate: unit test

Test -D and -F flag of fs_config_generate

Test: gTest host fs_config-unit-tests
Bug: 36071012
Change-Id: I23a655b17b7c55817f2aacc760700ff1b0728db3

tools/fs_config/fs_config_generate.c

diff --git a/tools/fs_config/fs_config_generate.c b/tools/fs_config/fs_config_generate.c
index c06213f..e08642f 100644
--- a/tools/fs_config/fs_config_generate.c
+++ b/tools/fs_config/fs_config_generate.c
@@ -28,7 +28,11 @@
  * the binary format used in the /system/etc/fs_config_dirs and
  * the /system/etc/fs_config_files to be used by the runtimes.
  */
+#ifdef ANDROID_FILESYSTEM_CONFIG
+#include ANDROID_FILESYSTEM_CONFIG
+#else
 #include "android_filesystem_config.h"
+#endif
 
 #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
   static const struct fs_path_config android_device_dirs[] = {