Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ca9d0c authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: e71eae1f

* commit 'e71eae1f':
  fs_config: error on multiple specifications of android_filesystem_config.h
parents 930dd474 e71eae1f

tools/fs_config/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -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))".)