From b6ddb932ca477fc8242be5c1c0dec2b271d5eed5 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Tue, 10 Sep 2019 15:42:56 +0800 Subject: [PATCH] fs_config: Fix generation for devices without vendor partition If the "--all-partitions" argument is empty, the system fs_config should be generated with all partitions emitted. Bug: 140578676 Test: build with only a system partition and check fs_config result Fixes: 8453f02c (fs_config: Fix cases without vendor/oem partition) Change-Id: I058cfd1c8e665b40757998e773c35e26465bf58a Signed-off-by: dianlujitao (cherry picked from commit 5dcbe701cfc917b87c472decb52a0a85971a76a1) --- tools/fs_config/fs_config_generator.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/fs_config/fs_config_generator.py b/tools/fs_config/fs_config_generator.py index 440046608..109b29a16 100755 --- a/tools/fs_config/fs_config_generator.py +++ b/tools/fs_config/fs_config_generator.py @@ -1133,6 +1133,8 @@ class FSConfigGen(BaseGenerator): path = fs_config.path if self._partition == 'system': + if not self._all_partitions: + return True for skip_partition in self._all_partitions.split(','): if path.startswith(skip_partition) or path.startswith( 'system/' + skip_partition):