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

Commit de12e39a authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020faf 

am: 151e8560

Change-Id: I6aae6d254471f48c1af0ce80c58ac890831c49fe
parents 225fd805 151e8560

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