diff options
author | dianlujitao <dianlujitao@lineageos.org> | 2019-09-10 15:42:56 +0800 |
---|---|---|
committer | Tom Cherry <tomcherry@google.com> | 2019-09-19 16:23:16 -0700 |
commit | b6ddb932ca477fc8242be5c1c0dec2b271d5eed5 (patch) | |
tree | e0fe03bf9dd683a2d24297babed224465ed0b083 | |
parent | 5417105d0f2445531cb8ec47955322c1c9318a0e (diff) | |
download | build-b6ddb932ca477fc8242be5c1c0dec2b271d5eed5.tar.gz |
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 <dianlujitao@lineageos.org>
(cherry picked from commit 5dcbe701cfc917b87c472decb52a0a85971a76a1)
-rwxr-xr-x | tools/fs_config/fs_config_generator.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/fs_config/fs_config_generator.py b/tools/fs_config/fs_config_generator.py index 4400466084..109b29a160 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): |