diff options
author | 2018-11-16 14:21:47 +0000 | |
---|---|---|
committer | 2018-11-16 14:21:47 +0000 | |
commit | 54c7da9c50ee85ade636605cd6ea18b4c2bc69fa (patch) | |
tree | 57e1a23dcc0beba8e98841b8cf063f6153b08c9b /runtime/runtime.cc | |
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 'runtime/runtime.cc')
-rw-r--r-- | runtime/runtime.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 4720599a91..f016e874ca 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -61,6 +61,7 @@ #include "base/mutex.h" #include "base/os.h" #include "base/quasi_atomic.h" +#include "base/sdk_version.h" #include "base/stl_util.h" #include "base/systrace.h" #include "base/unix_file/fd_file.h" @@ -253,7 +254,7 @@ Runtime::Runtime() preinitialization_transactions_(), verify_(verifier::VerifyMode::kNone), allow_dex_file_fallback_(true), - target_sdk_version_(kUnsetSdkVersion), + target_sdk_version_(static_cast<uint32_t>(SdkVersion::kUnset)), implicit_null_checks_(false), implicit_so_checks_(false), implicit_suspend_checks_(false), |