diff options
| author | 2018-11-16 14:21:47 +0000 | |
|---|---|---|
| committer | 2018-11-16 14:21:47 +0000 | |
| commit | 54c7da9c50ee85ade636605cd6ea18b4c2bc69fa (patch) | |
| tree | 57e1a23dcc0beba8e98841b8cf063f6153b08c9b /libdexfile/dex/modifiers.h | |
| parent | d94653399e2f9f06bbdf629f2affbf9a4fa73b8f (diff) | |
| parent | 2bb2fbd2879d0a6d9ebf7acff817079dde89b417 (diff) | |
Merge changes Idc6e518c,Ia1cc0506
* changes:
Create SdkVersion enum, migrate users to it
Runtime flags only for fast/slow hiddenapi path
Diffstat (limited to 'libdexfile/dex/modifiers.h')
| -rw-r--r-- | libdexfile/dex/modifiers.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libdexfile/dex/modifiers.h b/libdexfile/dex/modifiers.h index c4ea2d39b4..114c8e63e3 100644 --- a/libdexfile/dex/modifiers.h +++ b/libdexfile/dex/modifiers.h @@ -52,7 +52,7 @@ static constexpr uint32_t kAccObsoleteMethod = 0x00040000; // method (ru static constexpr uint32_t kAccSkipAccessChecks = 0x00080000; // method (runtime, not native) // Used by a class to denote that the verifier has attempted to check it at least once. static constexpr uint32_t kAccVerificationAttempted = 0x00080000; // class (runtime) -static constexpr uint32_t kAccSkipHiddenApiChecks = 0x00100000; // class (runtime) +static constexpr uint32_t kAccSkipHiddenapiChecks = 0x00100000; // class (runtime) // This is set by the class linker during LinkInterfaceMethods. It is used by a method to represent // that it was copied from its declaring class into another class. All methods marked kAccMiranda // and kAccDefaultConflict will have this bit set. Any kAccDefault method contained in the methods_ @@ -84,7 +84,8 @@ static constexpr uint32_t kAccMustCountLocks = 0x04000000; // method (ru // virtual call. static constexpr uint32_t kAccSingleImplementation = 0x08000000; // method (runtime) -static constexpr uint32_t kAccHiddenApiBits = 0x30000000; // field, method +static constexpr uint32_t kAccPublicApi = 0x10000000; // field, method +static constexpr uint32_t kAccHiddenapiBits = 0x30000000; // field, method // Non-intrinsics: Caches whether we can use fast-path in the interpreter invokes. // Intrinsics: These bits are part of the intrinsic ordinal. @@ -103,7 +104,7 @@ static constexpr uint32_t kAccClassIsFinalizable = 0x80000000; // Continuous sequence of bits used to hold the ordinal of an intrinsic method. Flags // which overlap are not valid when kAccIntrinsic is set. -static constexpr uint32_t kAccIntrinsicBits = kAccHiddenApiBits | +static constexpr uint32_t kAccIntrinsicBits = kAccHiddenapiBits | kAccSingleImplementation | kAccMustCountLocks | kAccCompileDontBother | kAccDefaultConflict | kAccPreviouslyWarm | kAccFastInterpreterToInterpreterInvoke; |