openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "fs_config: Fix cases without vendor/oem partition"

This commit is contained in:
Treehugger Robot 2019-05-30 16:41:34 +00:00 committed by Gerrit Code Review
parent 523362d544 8453f02c65
commit 2d33715f1c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/fs_config/Android.mk
View File

@ -99,7 +99,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
--aid-header $(PRIVATE_ANDROID_FS_HDR) \ --aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \ --capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system \ --partition system \
--all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \ --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \
--dirs \ --dirs \
--out_file $@ \ --out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null) $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
@ -124,7 +124,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
--aid-header $(PRIVATE_ANDROID_FS_HDR) \ --aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \ --capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system \ --partition system \
--all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \ --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \
--files \ --files \
--out_file $@ \ --out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null) $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

4
tools/fs_config/fs_config_generator.py
View File

@ -1004,10 +1004,6 @@ class FSConfigGen(BaseGenerator):
self._partition = args['partition'] self._partition = args['partition']
self._all_partitions = args['all_partitions'] self._all_partitions = args['all_partitions']
if self._partition == 'system' and self._all_partitions is None:
sys.exit(
'All other partitions must be provided if generating output'
' for the system partition')
self._out_file = args['out_file'] self._out_file = args['out_file']