diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-11-16 14:21:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-16 14:21:47 +0000 |
| commit | 54c7da9c50ee85ade636605cd6ea18b4c2bc69fa (patch) | |
| tree | 57e1a23dcc0beba8e98841b8cf063f6153b08c9b /runtime/jni/java_vm_ext.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/jni/java_vm_ext.cc')
| -rw-r--r-- | runtime/jni/java_vm_ext.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc index 6769368ee4..a61a48a29b 100644 --- a/runtime/jni/java_vm_ext.cc +++ b/runtime/jni/java_vm_ext.cc @@ -23,6 +23,7 @@ #include "art_method-inl.h" #include "base/dumpable.h" #include "base/mutex-inl.h" +#include "base/sdk_version.h" #include "base/stl_util.h" #include "base/systrace.h" #include "check_jni.h" @@ -1030,7 +1031,7 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, JNI_OnLoadFn jni_on_load = reinterpret_cast<JNI_OnLoadFn>(sym); int version = (*jni_on_load)(this, nullptr); - if (runtime_->GetTargetSdkVersion() != 0 && runtime_->GetTargetSdkVersion() <= 21) { + if (IsSdkVersionSetAndAtMost(runtime_->GetTargetSdkVersion(), SdkVersion::kL)) { // Make sure that sigchain owns SIGSEGV. EnsureFrontOfChain(SIGSEGV); } |