StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fs_config: fix fs_config_*_system targets"

Browse Source
This commit is contained in:
Treehugger Robot
2018-11-19 15:15:33 +00:00
committed by Gerrit Code Review
parent 7320a023ea 705b59e155
commit 25d43708c8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/fs_config/Android.mk
View File

@@ -163,10 +163,11 @@ LOCAL_MODULE := fs_config_dirs_system
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
include $(BUILD_SYSTEM)/base_rules.mk 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) $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$< -D $(if $(fs_config_generate_extra_partition_list), \ $< -D $(if $(PRIVATE_PARTITION_LIST), \
-P '$(subst $(space),$(comma),$(addprefix -,$(fs_config_generate_extra_partition_list)))') \ -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \
-o $@ -o $@
################################## ##################################
@@ -179,10 +180,11 @@ LOCAL_MODULE := fs_config_files_system
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
include $(BUILD_SYSTEM)/base_rules.mk 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) $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$< -F $(if $(fs_config_generate_extra_partition_list), \ $< -F $(if $(PRIVATE_PARTITION_LIST), \
-P '$(subst $(space),$(comma),$(addprefix -,$(fs_config_generate_extra_partition_list)))') \ -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \
-o $@ -o $@
ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),) ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),)