Merge "Revert "Output of apexer is deterministic""

1 files changed, 3 insertions, 13 deletions

diff --git a/apexer/apexer.py b/apexer/apexer.py
index 0926638..ac33b2d 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -23,7 +23,6 @@ Typical usage: apexer input_dir output.apex
 """
 
 import argparse
-import hashlib
 import json
 import os
 import re
@@ -31,7 +30,6 @@ import shutil
 import subprocess
 import sys
 import tempfile
-import uuid
 
 if 'APEXER_TOOL_PATH' not in os.environ:
   sys.stderr.write("""
@@ -218,11 +216,8 @@ def CreateApex(args, work_dir):
     cmd.extend(['-m', '0']) # reserved block percentage
     cmd.extend(['-t', 'ext4'])
     cmd.append(img_file)
-    uu = str(uuid.uuid5(uuid.NAMESPACE_URL, "www.android.com"))
-    cmd.extend(['-U', uu])
-    cmd.extend(['-E', 'hash_seed=' + uu])
     cmd.append(str(size_in_mb) + 'M')
-    RunCommand(cmd, args.verbose, {"E2FSPROGS_FAKE_TIME": "1"})
+    RunCommand(cmd, args.verbose)
 
     # Compile the file context into the binary form
     compiled_file_contexts = os.path.join(work_dir, 'file_contexts.bin')
@@ -248,14 +243,13 @@ def CreateApex(args, work_dir):
     cmd.extend(['-S', compiled_file_contexts])
     cmd.extend(['-C', args.canned_fs_config])
     cmd.append(img_file)
-    RunCommand(cmd, args.verbose, {"E2FSPROGS_FAKE_TIME": "1"})
+    RunCommand(cmd, args.verbose)
 
     # Resize the image file to save space
     cmd = ['resize2fs']
     cmd.append('-M') # shrink as small as possible
     cmd.append(img_file)
-    RunCommand(cmd, args.verbose, {"E2FSPROGS_FAKE_TIME": "1"})
-
+    RunCommand(cmd, args.verbose)
 
     cmd = ['avbtool']
     cmd.append('add_hashtree_footer')
@@ -263,10 +257,6 @@ def CreateApex(args, work_dir):
     cmd.extend(['--algorithm', 'SHA256_RSA4096'])
     cmd.extend(['--key', args.key])
     cmd.extend(['--prop', "apex.key:" + key_name])
-    # Set up the salt based on manifest content which includes name
-    # and version
-    salt = hashlib.sha256(json.dumps(manifest)).hexdigest()
-    cmd.extend(['--salt', salt])
     cmd.extend(['--image', img_file])
     RunCommand(cmd, args.verbose)