summaryrefslogtreecommitdiff
path: root/runtime/class_linker.cc
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2018-10-30 11:04:46 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-10-30 11:04:46 +0000
commitb97c8af44dca6f0edbe80b13921bd47f9913c6fb (patch)
treef2693adde283631362b3acc2c573d7280632621f /runtime/class_linker.cc
parent6e32b0059b4c3073c601018da3ca315ad568525a (diff)
parent47cd272d15f41109b3dacb21cfa509d18a03e011 (diff)
Merge "Remove HiddenApiAccessFlags, move content to hiddenapi::"
Diffstat (limited to 'runtime/class_linker.cc')
-rw-r--r--runtime/class_linker.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 0247e4e076..151f7b8565 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3395,8 +3395,8 @@ void ClassLinker::LoadField(const ClassAccessor::Field& field,
// also set its runtime hidden API access flags.
uint32_t access_flags = field.GetAccessFlags();
if (klass->IsBootStrapClassLoaded()) {
- access_flags = HiddenApiAccessFlags::EncodeForRuntime(
- access_flags, static_cast<HiddenApiAccessFlags::ApiList>(field.GetHiddenapiFlags()));
+ access_flags = hiddenapi::EncodeForRuntime(
+ access_flags, static_cast<hiddenapi::ApiList>(field.GetHiddenapiFlags()));
}
dst->SetAccessFlags(access_flags);
}
@@ -3418,8 +3418,8 @@ void ClassLinker::LoadMethod(const DexFile& dex_file,
// also set its runtime hidden API access flags.
uint32_t access_flags = method.GetAccessFlags();
if (klass->IsBootStrapClassLoaded()) {
- access_flags = HiddenApiAccessFlags::EncodeForRuntime(
- access_flags, static_cast<HiddenApiAccessFlags::ApiList>(method.GetHiddenapiFlags()));
+ access_flags = hiddenapi::EncodeForRuntime(
+ access_flags, static_cast<hiddenapi::ApiList>(method.GetHiddenapiFlags()));
}
if (UNLIKELY(strcmp("finalize", method_name) == 0)) {