diff options
| author | Pete Gillin <peteg@google.com> | 2019-08-09 11:15:40 +0000 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2019-08-09 11:18:39 +0000 |
| commit | 76351e3e3fbbd386c059251dbc6b1081a8f77088 (patch) | |
| tree | e0d113ebe7e518c6edb6b09196b76ae26340f0c3 /linker/linker_sdk_versions.cpp | |
| parent | 66b5e3ca1941a118bbb8ea41bfe98f9725ee8d5d (diff) | |
Revert "fdsan: make fatal by default."
This reverts commit 66b5e3ca1941a118bbb8ea41bfe98f9725ee8d5d.
Reason for revert: Causes installd_dexopt_test to fail. Presumably there is an existing issue which this change is turning into a hard fail, so that needs to be fixed before this can be rolled forwards. See b/139092341.
Bug: 139092341
Bug: 137788030
Change-Id: I1beccddff64c86541bc003b9b009f4046ec9cbf1
Diffstat (limited to 'linker/linker_sdk_versions.cpp')
| -rw-r--r-- | linker/linker_sdk_versions.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp index 29c0f4af2..b06f3e63f 100644 --- a/linker/linker_sdk_versions.cpp +++ b/linker/linker_sdk_versions.cpp @@ -26,12 +26,9 @@ * SUCH DAMAGE. */ -#include <atomic> - -#include <android/api-level.h> -#include <android/fdsan.h> - #include "linker.h" +#include <android/api-level.h> +#include <atomic> static std::atomic<int> g_target_sdk_version(__ANDROID_API__); @@ -41,10 +38,6 @@ void set_application_target_sdk_version(int target) { target = __ANDROID_API__; } g_target_sdk_version = target; - - if (target < 30) { - android_fdsan_set_error_level_from_property(ANDROID_FDSAN_ERROR_LEVEL_WARN_ONCE); - } } int get_application_target_sdk_version() { |