diff options
| author | Sandeep Dhavale <dhavale@google.com> | 2023-02-07 20:51:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-07 20:51:19 +0000 |
| commit | 7a7e1d2f16cbd30030587a2570e379d6f445b663 (patch) | |
| tree | da278045d7269f6f627132da1fbe7111094a68fa | |
| parent | 5110d487a2ef84271264c8ca4e84ff4183646023 (diff) | |
| parent | 5dda6b547be01c7a6d7cfb44c31cf881471a012c (diff) | |
| download | extras-7a7e1d2f16cbd30030587a2570e379d6f445b663.tar.gz | |
Merge "Set mke2fs blocksize based on lunch target" into main-16k-with-phones
| -rw-r--r-- | ext4_utils/mkuserimg_mke2fs.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext4_utils/mkuserimg_mke2fs.py b/ext4_utils/mkuserimg_mke2fs.py index 057cb34b..e08f8f78 100644 --- a/ext4_utils/mkuserimg_mke2fs.py +++ b/ext4_utils/mkuserimg_mke2fs.py @@ -195,7 +195,14 @@ def ConstructE2fsCommands(args): # Round down the filesystem length to be a multiple of the block size block_size = BLOCKSIZE - if 'data' in args.mount_point: + + target="TARGET_PRODUCT" + if target in os.environ and '_16k' in os.environ[target].lower(): + target_has_16k=True + else: + target_has_16k=False + + if 'data' in args.mount_point and target_has_16k: block_size = 16384 mke2fs_opts += ["-F"] |