diff --git a/Android.bp b/Android.bp
index 31afc19..a22d077 100644
--- a/Android.bp
+++ b/Android.bp
@@ -174,12 +174,14 @@
     "libunwindstack",
   ],
   static_libs: [
+    "libasync_safe",
     "libgtest_prod",
   ],
   defaults: [
     "perfetto_defaults",
   ],
   cflags: [
+    "-DPERFETTO_ANDROID_ASYNC_SAFE_LOG",
     "-DPERFETTO_BUILD_WITH_ANDROID",
   ],
   include_dirs: [
@@ -347,15 +349,15 @@
     "liblog",
     "libutils",
   ],
+  static_libs: [
+    "libhealthhalutils",
+  ],
   defaults: [
     "perfetto_defaults",
   ],
   cflags: [
     "-DPERFETTO_BUILD_WITH_ANDROID",
   ],
-  static_libs: [
-    "libhealthhalutils",
-  ],
 }
 
 // GN target: //:perfetto