commit 0f745aaf4dded51a6b5265ab94ba3361ced75554
author Dan Willemsen <dwillemsen@google.com> Thu Feb 11 21:01:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 11 21:01:18 2016 +0000
tree 7a67dfae21efc13c4c26863d57323f6537a15540
parent 8b56d4ad55fc81e65dbe7e2a427e159e1281a544
parent 78626c480aa16a60bbae8fc46cab8bf0b7192ec2

Merge "fs_config: error on multiple specifications of android_filesystem_config.h"

tools/fs_config/Android.mk

diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index 34a3522..be140b5 100644
--- a/tools/fs_config/Android.mk
+++ b/tools/fs_config/Android.mk
@@ -37,6 +37,13 @@
 ANDROID_FS_CONFIG_H := android_filesystem_config.h
 
 ifneq ($(TARGET_ANDROID_FILESYSTEM_CONFIG_H),)
+
+# One and only one file can be specified.
+ifneq ($(words $(TARGET_ANDROID_FILESYSTEM_CONFIG_H)),1)
+$(error Multiple fs_config files specified, \
+ see "$(TARGET_ANDROID_FILESYSTEM_CONFIG_H)".)
+endif
+
 ifeq ($(filter %/$(ANDROID_FS_CONFIG_H),$(TARGET_ANDROID_FILESYSTEM_CONFIG_H)),)
 $(error TARGET_ANDROID_FILESYSTEM_CONFIG_H file name must be $(ANDROID_FS_CONFIG_H), \
  see "$(notdir $(TARGET_ANDROID_FILESYSTEM_CONFIG_H))".)