commit 976b01f62ad8fa2e4a25f64c152839eb37552f9e
author David Brazdil <dbrazdil@google.com> Mon Nov 12 10:46:14 2018 +0000
committer David Brazdil <dbrazdil@google.com> Mon Nov 12 10:49:29 2018 +0000
tree 5b6206e8a069f5b824e7c96582188f1601a4afa0
parent fe59955fc41e277bf1c60378202ba785abb1e4a8

hiddenapi: Initialize unused value in DexFile::MapItem

The build tool adds a new MapItem into the MapList of a dex file
which points to the new hiddenapi flags section. However, hiddenapi
would not initialize the `unused_` field in MapItem and therefore
result in non-deterministic builds.

Bug: 119308882
Test: invoke hiddenapi twice of the same dex, diff the two files
Change-Id: I00d0dc909a3424f3eb2776cf87719c074f264e74

tools/hiddenapi/hiddenapi.cc

diff --git a/tools/hiddenapi/hiddenapi.cc b/tools/hiddenapi/hiddenapi.cc
index f61b3e8..65a4945 100644
--- a/tools/hiddenapi/hiddenapi.cc
+++ b/tools/hiddenapi/hiddenapi.cc
@@ -813,6 +813,7 @@
     // Create a new MapItem entry with new MapList details.
     DexFile::MapItem new_item;
     new_item.type_ = old_item.type_;
+    new_item.unused_ = 0u;  // initialize to ensure dex output is deterministic (b/119308882)
     new_item.size_ = old_item.size_;
     new_item.offset_ = new_map_offset;