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

Commit 8453f02c authored by Felix's avatar Felix
Browse files

fs_config: Fix cases without vendor/oem partition 



If the device has neither an OEM nor a vendor partiton,
$PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail
because the "--all-partitions" argument will be empty.

Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be
empty - to appease argparse, which will then populate "_all_partitions"
with an empty "str" object.

Checking _all_partitions against None is superfluous since either
argparse will catch the empty argument and fail early, or the argument
will be a string, in which case it will not be None.

Signed-off-by: default avatarFelix <google@ix5.org>
Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
parent cd56c0df

tools/fs_config/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 
	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \

	   --dirs \

	   --out_file $@ \

	   $(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) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

tools/fs_config/fs_config_generator.py

+0 −4
Original line number Diff line number Diff line
@@ -1004,10 +1004,6 @@ class FSConfigGen(BaseGenerator): 


        self._partition = args['partition']

        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']