diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index ad64e866eb81f94ec1c40e8ecf5da3744559e439..580cb8e230b5f2100c7f93ff56124a7a1f92faa1 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -128,6 +128,9 @@ cc_library_static {
     ],
     target: {
         android: {
+            whole_static_libs: [
+                "libPlatformProperties",
+            ],
             srcs: ["src/btif_avrcp_audio_track.cc"],
             shared_libs: ["libaaudio"],
         },
@@ -211,9 +214,6 @@ cc_library_static {
     ],
     target: {
         android: {
-            whole_static_libs: [
-                "libPlatformProperties",
-            ],
             srcs: ["src/btif_avrcp_audio_track.cc"],
             shared_libs: ["libaaudio"],
         },
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 9f6aeca5d64973efdc25f4b0ca7ea07bee68e710..31719b5619b5839e974859b948b666eaa63215f0 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -116,6 +116,7 @@ cc_binary {
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
         "android.system.suspend-V1-ndk",
+        "libPlatformProperties",
         "libaaudio",
         "libbase",
         "libbinder_ndk",
@@ -127,7 +128,6 @@ cc_binary {
         "liblog", // __android_log_print
         "libstatssocket",
         "libutils",
-        "libPlatformProperties",
     ],
     header_libs: ["libbluetooth_headers"],
 }
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 89c5e154ce2eb4618af2d081235fadf503f24882..b45fe8e8f4538857451522c84f22672a3c4aa95d 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -50,6 +50,7 @@ cc_defaults {
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
         "android.system.suspend-V1-ndk",
+        "libPlatformProperties",
         "libbinder",
         "libbinder_ndk",
         "libcrypto",
@@ -58,7 +59,6 @@ cc_defaults {
         "liblog",
         "libstatssocket",
         "libutils",
-        "libPlatformProperties",
     ],
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",