libpropertyinfoparser: only use system_shared_libs for bionic variant

libpropertyinfoparser is a dependency of libc, and so cannot use the
default system_shared_libs that includes libc.  It's not a dependency
of musl's libc though, and it needs to use musl's libc headers,
not the bionic libc headers provided by the libc_headers module.  Move
system_shared_libs and libc_headers into a target.bionic clause.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Ie1f908c02fc69ae7d46b10e2fdb5dafbc3ad8557

1 files changed, 6 insertions, 2 deletions

diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp
index 68614566b..87646f99d 100644
--- a/property_service/libpropertyinfoparser/Android.bp
+++ b/property_service/libpropertyinfoparser/Android.bp
@@ -18,7 +18,11 @@ cc_library_static {
         "-Werror",
     ],
     stl: "none",
-    system_shared_libs: [],
-    header_libs: ["libc_headers"],
+    target: {
+        bionic: {
+            system_shared_libs: [],
+            header_libs: ["libc_headers"],
+        },
+    },
     export_include_dirs: ["include"],
 }