Merge "Switch the zygote over to mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL)." am: 2ccc6dfb02

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ba1e5f676f091d6c074168317deed719213c38b
This commit is contained in:
Treehugger Robot
2021-01-15 22:22:11 +00:00
committed by Automerger Merge Worker

View File

@@ -1810,7 +1810,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
heap_tagging_level = M_HEAP_TAGGING_LEVEL_NONE;
break;
}
android_mallopt(M_SET_HEAP_TAGGING_LEVEL, &heap_tagging_level, sizeof(heap_tagging_level));
mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL, heap_tagging_level);
// Now that we've used the flag, clear it so that we don't pass unknown flags to the ART runtime.
runtime_flags &= ~RuntimeFlags::MEMORY_TAG_LEVEL_MASK;