commit 3a29355967f29999ba81b5772ec66d3ddee9ce3e
author Nicolas Geoffray <ngeoffray@google.com> Fri Mar 02 10:52:16 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 14 09:23:27 2018 +0000
tree 29a986af4700e8307b02534e434b406dd8c0c6b1
parent 1f9df4ae66667d3c0b62caace7f2f4374e104159

Separate vdex versioning into two sections: verifier deps and dex code.

The layout is still the same, but this CL allows updating the cdex and
quickening encoding versions without having to update the verifier deps
version.

bug: 63920015
Test: test.py, dex2oat_test, oat_writer_test, oatdump_test
Change-Id: Ifd282b4c1856f7597d8d26577bf58b9ad87da084

runtime/oat_file_assistant.cc

diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index 5888c37..38ca4c9 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -408,7 +408,7 @@
     return true;
   }
 
-  uint32_t number_of_dex_files = file.GetHeader().GetNumberOfDexFiles();
+  uint32_t number_of_dex_files = file.GetVerifierDepsHeader().GetNumberOfDexFiles();
   if (required_dex_checksums->size() != number_of_dex_files) {
     *error_msg = StringPrintf("expected %zu dex files but found %u",
                               required_dex_checksums->size(),