commit de12e39af70fba30e3fa22754d17ef9bc0f7a617
author Mark Salyzyn <salyzyn@google.com> Thu Apr 27 15:44:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 15:44:38 2017 +0000
tree 261dd5d2b3c2e0a33cc162085507a154833733af
parent 225fd8057f3ee14689e03c6bb44e82602f91548e
parent 151e856015c8c528172b3e5b89630c011c11e25a

Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2
am: 151e856015

Change-Id: I6aae6d254471f48c1af0ce80c58ac890831c49fe

tools/fs_config/Android.mk

diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index 7e5c88e..dcd41aa 100644
--- a/tools/fs_config/Android.mk
+++ b/tools/fs_config/Android.mk
@@ -126,7 +126,7 @@
 
 LOCAL_MODULE := fs_config_dirs
 LOCAL_MODULE_CLASS := ETC
-LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partion_list),$(LOCAL_MODULE)_$(t))
+LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))
 include $(BUILD_SYSTEM)/base_rules.mk
 $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
 	@mkdir -p $(dir $@)
@@ -141,7 +141,7 @@
 
 LOCAL_MODULE := fs_config_files
 LOCAL_MODULE_CLASS := ETC
-LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partion_list),$(LOCAL_MODULE)_$(t))
+LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))
 include $(BUILD_SYSTEM)/base_rules.mk
 $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
 	@mkdir -p $(dir $@)