commit 634b3eaec7fc3d8b0a293039011ec889d0d045d1
author Søren Gjesse <sgjesse@google.com> Fri Jun 14 14:34:57 2019 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 17 07:56:29 2019 +0000
tree fe0dcc24f2fd54ab7b81293476a63a500e1b7519
parent 41d71ebf116e2bc4793105a5c8dd7d45c2db3657

Fix calculation of dex header signature

Patch by: Kevin Sun snxngxng@gmail.com

Bug: 135168811
Change-Id: I98290958cce65a0c88958b4f60c2e007af8ddc62

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 9087735..02ac16e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,4 +5,6 @@
 
 Google Inc.
 Uber Technologies Inc.
+
 Albert Jin <albert.jin@gmail.com>
+Kevin Sun <snxngxng@gmail.com>

src/main/java/com/android/tools/r8/dex/FileWriter.java

diff --git a/src/main/java/com/android/tools/r8/dex/FileWriter.java b/src/main/java/com/android/tools/r8/dex/FileWriter.java
index a0cb023..8e0593d 100644
--- a/src/main/java/com/android/tools/r8/dex/FileWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/FileWriter.java
@@ -781,7 +781,7 @@
     try {
       MessageDigest md = MessageDigest.getInstance("SHA-1");
       md.update(dest.asArray(), Constants.FILE_SIZE_OFFSET,
-          layout.getEndOfFile() - Constants.FIELD_IDS_OFF_OFFSET);
+          layout.getEndOfFile() - Constants.FILE_SIZE_OFFSET);
       md.digest(dest.asArray(), Constants.SIGNATURE_OFFSET, 20);
     } catch (Exception e) {
       throw new RuntimeException(e);