diff --git a/libcutils/Android.bp b/libcutils/Android.bp index d46aeab38..c75e538d9 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -167,7 +167,6 @@ cc_library { "canned_fs_config.cpp", "iosched_policy.cpp", "load_file.cpp", - "memory.cpp", "native_handle.cpp", "properties.cpp", "record_stream.cpp", diff --git a/libcutils/include/cutils/memory.h b/libcutils/include/cutils/memory.h index 0fba53c3f..c6476c138 100644 --- a/libcutils/include/cutils/memory.h +++ b/libcutils/include/cutils/memory.h @@ -28,9 +28,6 @@ extern "C" { size_t strlcpy(char *dst, const char *src, size_t size); #endif -// Disables memory mitigations for the entire process, and logs appropriately. -void process_disable_memory_mitigations(); - #ifdef __cplusplus } // extern "C" #endif diff --git a/libcutils/memory.cpp b/libcutils/memory.cpp deleted file mode 100644 index 5a410c278..000000000 --- a/libcutils/memory.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include - -#if !defined(__APPLE__) -#include -#endif - -void process_disable_memory_mitigations() { - bool success = false; -#ifdef __BIONIC__ - success = mallopt(M_BIONIC_DISABLE_MEMORY_MITIGATIONS, 0); -#endif - - // TODO: if b/158870657 is fixed and scudo is used globally, - // we can assert on failure rather than just log. - if (success) { - ALOGI("Disabled memory mitigations for process."); - } else { - ALOGE("Could not disable memory mitigations for process."); - } -}