From d6f914ea4bd09f2d60db2783f7a3fd93d3ec0afb Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 15 Feb 2018 13:56:50 +0000 Subject: Full-stack integrity: check vdex contents. For priv-apps, if a vdex on /data has dex code, it must be because the APK has compressed dex code. Fall back to APK if not. For test convenience, update --copy-dex-files to also take a "always" variant. bug: 30972906 Test: 677-fsi Change-Id: I49f0eab46650145316a86de2971a3b9c140bcff7 --- runtime/oat_file_assistant.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/oat_file_assistant.h') diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h index a184807b73..6da49a9c29 100644 --- a/runtime/oat_file_assistant.h +++ b/runtime/oat_file_assistant.h @@ -508,6 +508,9 @@ class OatFileAssistant { // Whether only oat files on /system are loaded executable. const bool only_load_system_executable_ = false; + // Whether the potential zip file only contains uncompressed dex. + // Will be set during GetRequiredDexChecksums. + bool zip_file_only_contains_uncompressed_dex_ = true; // Cached value of the required dex checksums. // This should be accessed only by the GetRequiredDexChecksums() method. -- cgit v1.2.3-59-g8ed1b