commit 3dcd4b8d7b48fb8030d58ec63ce48fd53fa440eb
author Victor Hsieh <victorhsieh@google.com> Tue Sep 13 15:42:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 13 15:42:22 2022 +0000
tree 21bbe99b11cafd8fc4595c1566315cd1656dcb1a
parent 37b159e5f638253672d7d55c338b084af945f940
parent a23337f05ed053f3052587da1e97e5ecd8aa7284

Merge "Add TEST_MAPPING for system/security/fsverity"

fsverity/Android.bp

diff --git a/fsverity/Android.bp b/fsverity/Android.bp
index 040c99b..ce3b499 100644
--- a/fsverity/Android.bp
+++ b/fsverity/Android.bp
@@ -32,14 +32,6 @@
     proto: {
         canonical_path_from_root: false,
     },
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }
 
 python_binary_host {

fsverity/fsverity_manifest_generator.py

diff --git a/fsverity/fsverity_manifest_generator.py b/fsverity/fsverity_manifest_generator.py
index 0b01a55..79be591 100644
--- a/fsverity/fsverity_manifest_generator.py
+++ b/fsverity/fsverity_manifest_generator.py
@@ -58,7 +58,6 @@
   for f in sorted(args.inputs):
     # f is a full path for now; make it relative so it starts with {mount_point}/
     digest = digests.digests[os.path.relpath(f, args.base_dir)]
-    print(f"{os.path.relpath(f, args.base_dir)}")
     digest.digest = _digest(args.fsverity_path, f)
     digest.hash_alg = HASH_ALGORITHM