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

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

Merge "fs_config: fix fs_config_*_system targets" 

am: 25d43708

Change-Id: I362da596503840e335b00025c57c28ba052bd260
parents f89d9437 25d43708

tools/fs_config/Android.mk

+6 −4
Original line number Diff line number Diff line
@@ -163,10 +163,11 @@ LOCAL_MODULE := fs_config_dirs_system 
LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

	@mkdir -p $(dir $@)

	$< -D $(if $(fs_config_generate_extra_partition_list), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(fs_config_generate_extra_partition_list)))') \

	$< -D $(if $(PRIVATE_PARTITION_LIST), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \

	   -o $@



##################################
@@ -179,10 +180,11 @@ LOCAL_MODULE := fs_config_files_system 
LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

	@mkdir -p $(dir $@)

	$< -F $(if $(fs_config_generate_extra_partition_list), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(fs_config_generate_extra_partition_list)))') \

	$< -F $(if $(PRIVATE_PARTITION_LIST), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \

	   -o $@



ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),)