diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index d8101fa..f60b32e 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -225,10 +225,7 @@
         "portability*",
     ],
 
-    pgo: {
-        sampling: true,
-        profile_file: "libbinder/libbinder.profdata",
-    },
+    afdo: true,
 }
 
 cc_defaults {
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 3190038..fa853cb 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -78,11 +78,10 @@
     ],
 
     aidl: {
-        export_aidl_headers: true
-    }
+        export_aidl_headers: true,
+    },
 }
 
-
 cc_library_shared {
     name: "libgui",
     vendor_available: true,
@@ -192,10 +191,7 @@
         "libpdx_headers",
     ],
 
-    pgo: {
-        sampling: true,
-        profile_file: "libgui/libgui.profdata",
-    },
+    afdo: true,
 
     lto: {
         thin: true,
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index d4d0ee4..506e308 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -226,10 +226,7 @@
     ],
     min_sdk_version: "29",
 
-    pgo: {
-        sampling: true,
-        profile_file: "libui/libui.profdata",
-    },
+    afdo: true,
 }
 
 cc_library_headers {
diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp
index b596708..e6b118b 100644
--- a/services/sensorservice/Android.bp
+++ b/services/sensorservice/Android.bp
@@ -79,10 +79,7 @@
         "libpermission",
     ],
 
-    pgo: {
-        sampling: true,
-        profile_file: "sensorservice/libsensorservice.profdata",
-    },
+    afdo: true,
 }
 
 cc_binary {