diff options
author | 2022-01-10 09:48:55 +0000 | |
---|---|---|
committer | 2022-01-12 13:45:33 +0000 | |
commit | 84caad6a6af9052eb8f4feeaf93b510922d20a08 (patch) | |
tree | 61cfb68aed0db8e59245a93627343cb870f33546 /dexlayout/dexlayout.h | |
parent | 7ef64b191b546c607f510699f98f99d3b2995002 (diff) |
Reland "Remove old unquickening of vdex logic."
This reverts commit dcf9570d756aa74a2330406c13330c18c34e0db2.
Bug: 170086509
Reason for revert: Fix handling of input-vdex file.
Change-Id: Idbd59d4fe2be672858f33668a8564933518c28df
Diffstat (limited to 'dexlayout/dexlayout.h')
-rw-r--r-- | dexlayout/dexlayout.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dexlayout/dexlayout.h b/dexlayout/dexlayout.h index 9bb7b8b2e8..bdc7863cd1 100644 --- a/dexlayout/dexlayout.h +++ b/dexlayout/dexlayout.h @@ -99,7 +99,10 @@ class DexLayout { // Setting this to false disables class def layout entirely, which is stronger than strictly // necessary to ensure the partial order w.r.t. class derivation. TODO: Re-enable (b/68317550). + // This should never be set for a device build, as changing class defs ids + // conflict with profiles and verification passed by Play. static constexpr bool kChangeClassDefOrder = false; + static_assert(!(kIsTargetBuild && kChangeClassDefOrder), "Never set class reordering on target"); DexLayout(Options& options, ProfileCompilationInfo* info, |