diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-03-29 19:14:37 +0000 |
|---|---|---|
| committer | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-03-29 19:14:37 +0000 |
| commit | 066a2e0f2fbf5f8a843552461d885010f1e63b7d (patch) | |
| tree | a291e8f5b9752c3d4b67af3bc93e53a08f3f4fd1 /apexer/apexer.py | |
| parent | 4d1634160d7dbd850140c917072f73f1063a60d3 (diff) | |
Revert "apexer: Build filesystem images with inode size 256."
This reverts commit 4d1634160d7dbd850140c917072f73f1063a60d3.
Reason for revert:
b/129547377
Broken test: suite/test-mapping-presubmit-retry_cloud-tf on aosp-master
Change-Id: I804a380114a567c999a7c96198c66e8c8e6f7d22
Diffstat (limited to 'apexer/apexer.py')
| -rw-r--r-- | apexer/apexer.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py index 461b6a7..56b4c9b 100644 --- a/apexer/apexer.py +++ b/apexer/apexer.py @@ -243,7 +243,9 @@ def CreateApex(args, work_dir): cmd.extend(['-b', str(BLOCK_SIZE)]) cmd.extend(['-m', '0']) # reserved block percentage cmd.extend(['-t', 'ext4']) - cmd.extend(['-I', '256']) # inode size + # TODO(b/122991714) setting the inode size makes the image root digest + # non-deterministic, figure out why. + # cmd.extend(['-I', '256']) # inode size cmd.extend(['-N', str(inode_num)]) uu = str(uuid.uuid5(uuid.NAMESPACE_URL, "www.android.com")) cmd.extend(['-U', uu]) @@ -268,7 +270,7 @@ def CreateApex(args, work_dir): cmd.extend(['-C', args.canned_fs_config]) cmd.append('-s') # share dup blocks cmd.append(img_file) - RunCommand(cmd, args.verbose, {"E2FSPROGS_FAKE_TIME": "1"}) + RunCommand(cmd, args.verbose) cmd = ['e2fsdroid'] cmd.append('-e') # input is not android_sparse_file |