diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 319a73a..230a0af 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -171,9 +171,13 @@
                 // releases, exclude qtaguid.cpp from the VNDK-SP variant.
                 "qtaguid.cpp",
             ],
-        }
+        },
     },
 
+    defaults: [
+        "libprocessgroup_impl_provider",
+    ],
+
     shared_libs: [
         "liblog",
         "libbase",
@@ -182,11 +186,9 @@
         "libbase_headers",
         "libcutils_headers",
         "libutils_headers",
-        "libprocessgroup_headers",
     ],
     export_header_lib_headers: [
         "libcutils_headers",
-        "libprocessgroup_headers",
     ],
     local_include_dirs: ["include"],
 
diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
index 618a5c5..a2da57c 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -15,29 +15,58 @@
     },
 }
 
+// TODO: remove all usages
 cc_library {
-    srcs: [
-        "cgroup_map.cpp",
-        "processgroup.cpp",
-        "sched_policy.cpp",
-        "task_profiles.cpp",
-    ],
     name: "libprocessgroup",
     host_supported: true,
-    native_bridge_supported: true,
     recovery_available: true,
     vendor_available: true,
     vndk: {
         enabled: true,
         support_system_process: true,
     },
-    shared_libs: [
-        "libbase",
-        "libcgrouprc",
+}
+
+cc_defaults {
+    name: "libprocessgroup_impl_libs",
+    target: {
+        linux: {
+            shared_libs: [
+                "libbase",
+                "libcgrouprc",
+            ],
+            static_libs: [
+                "libjsoncpp",
+            ],
+        },
+    },
+}
+
+cc_defaults {
+    name: "libprocessgroup_impl_provider",
+    defaults: ["libprocessgroup_impl_libs"],
+    target: {
+        linux: {
+            whole_static_libs: [
+                "libprocessgroup_impl",
+            ],
+        },
+    },
+}
+
+cc_library {
+    name: "libprocessgroup_impl",
+    defaults: ["libprocessgroup_impl_libs"],
+    srcs: [
+        "cgroup_map.cpp",
+        "processgroup.cpp",
+        "sched_policy.cpp",
+        "task_profiles.cpp",
     ],
-    static_libs: [
-        "libjsoncpp",
-    ],
+    host_supported: true,
+    native_bridge_supported: true,
+    recovery_available: true,
+    vendor_available: true,
     // for cutils/android_filesystem_config.h
     header_libs: [
         "libcutils_headers",
diff --git a/logcat/Android.bp b/logcat/Android.bp
index 5030b15..0543aba 100644
--- a/logcat/Android.bp
+++ b/logcat/Android.bp
@@ -24,8 +24,8 @@
     ],
     shared_libs: [
         "libbase",
+        "libcutils",
         "libpcrecpp",
-        "libprocessgroup",
     ],
     static_libs: ["liblog"],
     logtags: ["event.logtags"],