diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 6ad64c249db77816554a3d69674cc7bad6285bdc..0a70ed12f275180b830ec35fbe413fae99facd77 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -129,6 +129,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 daceab8e65bf19e4aaac8bcc0ad00c197eccf0b4..df60cebe7210c9097114075060d17bd0d94c08d0 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -115,6 +115,7 @@ cc_binary {
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
         "android.system.suspend-V1-ndk",
+        "libPlatformProperties",
         "libaaudio",
         "libbase",
         "libbinder_ndk",
@@ -126,7 +127,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 27f9edc2eeb131e65463cfc9cd279d5c1e234fa1..c4d6195b83a6ff4bdf9319fed730a4f33621418d 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",