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

Commit eb8dc727 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES 

Misspelled fs_config_generate_extra_partition_list when used to
calculate LOCAL_REQUIRED_MODULES dependencies.  This resulted in
fs_config_dirs and fs_config_files failing to generate the vendor,
oem or odm variants (ie: fs_config_files_vendor)

Test: build generates correct fs_config override files.
Bug: 37721445
Bug: 36071012
Change-Id: I053dd5cdb357c7cea05a5ff63b0686bd0bc99df6
parent 6c8c20dd

tools/fs_config/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ include $(CLEAR_VARS) 


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 @@ include $(CLEAR_VARS) 


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 $@)