diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-02-11 21:01:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-11 21:01:18 +0000 |
| commit | 0f745aaf4dded51a6b5265ab94ba3361ced75554 (patch) | |
| tree | 7a67dfae21efc13c4c26863d57323f6537a15540 | |
| parent | 8b56d4ad55fc81e65dbe7e2a427e159e1281a544 (diff) | |
| parent | 78626c480aa16a60bbae8fc46cab8bf0b7192ec2 (diff) | |
| download | build-0f745aaf4dded51a6b5265ab94ba3361ced75554.tar.gz | |
Merge "fs_config: error on multiple specifications of android_filesystem_config.h"
| -rw-r--r-- | tools/fs_config/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index 34a35220fd..be140b500e 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -37,6 +37,13 @@ include $(BUILD_HOST_EXECUTABLE) 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))".) |