diff --git a/Android.bp b/Android.bp
index 9493cdb0d0c..130248d543c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -157,6 +157,8 @@ cc_defaults {
         "-DHAVE___BUILTIN_CLZ",
         "-DHAVE___BUILTIN_CLZLL",
         "-DHAVE___BUILTIN_UNREACHABLE",
+        "-DHAVE_PERFETTO",
+        "-DANDROID_LIBPERFETTO",
         "-DHAVE_PTHREAD=1",
         "-DHAVE_DLADDR",
         "-DHAVE_DL_ITERATE_PHDR",
diff --git a/src/gallium/targets/lavapipe/Android.bp b/src/gallium/targets/lavapipe/Android.bp
index 04cc89a737e..14a542d4701 100644
--- a/src/gallium/targets/lavapipe/Android.bp
+++ b/src/gallium/targets/lavapipe/Android.bp
@@ -101,6 +101,7 @@ cc_library_shared {
         "mesa_wsw",
         "mesa_loader",
         "libLLVM16_swiftshader",
+        "libperfetto_client_experimental",
     ],
     shared_libs: [
         "libzstd",
diff --git a/src/gfxstream/guest/vulkan/Android.bp b/src/gfxstream/guest/vulkan/Android.bp
index 195a803e0bd..be0badd00c4 100644
--- a/src/gfxstream/guest/vulkan/Android.bp
+++ b/src/gfxstream/guest/vulkan/Android.bp
@@ -53,6 +53,7 @@ cc_library_shared {
         "libringbuffer",
         "libqemupipe.ranchu",
         "libarect",
+        "libperfetto_client_experimental",
         "mesa_gfxstream_aemu",
         "mesa_gfxstream_guest_android",
         "mesa_gfxstream_connection_manager",
diff --git a/src/gfxstream/guest/vulkan_enc/Android.bp b/src/gfxstream/guest/vulkan_enc/Android.bp
index d657c0f7145..f9bce25c6af 100644
--- a/src/gfxstream/guest/vulkan_enc/Android.bp
+++ b/src/gfxstream/guest/vulkan_enc/Android.bp
@@ -48,6 +48,7 @@ cc_library_static {
     vendor: true,
     defaults: [
         "mesa_common_defaults",
+        "mesa_gfxstream_guest_cc_defaults",
     ],
     header_libs: [
         "mesa_common_headers",
diff --git a/src/util/Android.bp b/src/util/Android.bp
index 947eb60f1d9..f360771cec4 100644
--- a/src/util/Android.bp
+++ b/src/util/Android.bp
@@ -101,6 +101,7 @@ cc_library_static {
         "driconf_static_header",
     ],
     static_libs: [
+        "libperfetto_client_experimental",
         "mesa_util_c11",
     ],
     shared_libs: [
@@ -138,6 +139,7 @@ cc_library_static {
         "os_socket.c",
         "pb_slab.c",
         "perf/u_trace.c",
+        "perf/u_perfetto.cc",
         "u_process.c",
         "u_qsort.cpp",
         "rwlock.c",
diff --git a/src/vulkan/wsi/Android.bp b/src/vulkan/wsi/Android.bp
index 388a9355666..a06770f64bf 100644
--- a/src/vulkan/wsi/Android.bp
+++ b/src/vulkan/wsi/Android.bp
@@ -55,7 +55,6 @@ cc_library_static {
     static_libs: [
         "mesa_vulkan_util",
         "mesa_vulkan_runtime",
-        "mesa_gfxstream_vulkan_entrypoints",
         "mesa_util",
         "libdrm",
     ],