diff --git a/BUILD.gn b/BUILD.gn
index 83affe0..da23872 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -27,17 +27,7 @@
     if (swiftshader_startup_dialog) {
       defines += [ "DEBUGGER_WAIT_DIALOG" ]
     }
-  } else {
-    defines += [ "ANGLE_DISABLE_TRACE" ]
   }
-
-  if (!is_win || is_clang) {
-    defines +=
-        [ "NO_SANITIZE_FUNCTION=__attribute__((no_sanitize(\"function\")))" ]
-  } else {
-    defines += [ "NO_SANITIZE_FUNCTION=" ]
-  }
-
   if (is_win) {
     # Disable MSVC warnings about std::aligned_storage being broken before
     # VS 2017 15.8
diff --git a/src/Android.bp b/src/Android.bp
index a2f8d8a..26ed610 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -90,7 +90,6 @@
         "-DHAVE_GRALLOC1",
         "-DHAVE_GRALLOC3",
         "-DHAVE_GRALLOC4",
-        "-DNO_SANITIZE_FUNCTION=",
         // FIXME: Use <android/api-level.h> instead?
         "-DANDROID_PLATFORM_SDK_VERSION=10000",
         "-Wno-implicit-fallthrough",