Revert "libprocessgroup users use libcutils" am: 5360a8492d

am: 5e1c51498b

Change-Id: If615a455ffe449c3b8f5638c0b4e1cc4558468a8

libcutils/Android.bp

@@ -171,13 +171,9 @@ cc_library {
                 // releases, exclude qtaguid.cpp from the VNDK-SP variant.
                 "qtaguid.cpp",
             ],
-        },
+        }
     },
 
-    defaults: [
-        "libprocessgroup_impl_provider",
-    ],
-
     shared_libs: [
         "liblog",
         "libbase",
@@ -186,9 +182,11 @@ cc_library {
         "libbase_headers",
         "libcutils_headers",
         "libutils_headers",
+        "libprocessgroup_headers",
     ],
     export_header_lib_headers: [
         "libcutils_headers",
+        "libprocessgroup_headers",
     ],
     local_include_dirs: ["include"],
 

libprocessgroup/Android.bp

@@ -15,58 +15,29 @@ cc_library_headers {
     },
 }
 
-// TODO: remove all usages
 cc_library {
-    name: "libprocessgroup",
-    host_supported: true,
-    recovery_available: true,
-    vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
-}
-
-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",
     ],
+    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",
+    ],
+    static_libs: [
+        "libjsoncpp",
+    ],
     // for cutils/android_filesystem_config.h
     header_libs: [
         "libcutils_headers",

logcat/Android.bp

@@ -24,8 +24,8 @@ cc_defaults {
     ],
     shared_libs: [
         "libbase",
-        "libcutils",
         "libpcrecpp",
+        "libprocessgroup",
     ],
     static_libs: ["liblog"],
     logtags: ["event.logtags"],