commit 0e943542cdb229b4ce8c084f2e41ea45471c36f1
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 19 05:51:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 19 05:51:47 2019 +0000
tree 72113a0bd83972ccae543ed93039abba5a7dcb09
parent 19419976f6098f8f3b1a1c392e273056069b9e65
parent 22d281e899729ca53950bcc70a1b0275c1bfd251

Merge "Revert "libprocessgroup users use libcutils" am: 5360a8492d" into qt-dev-plus-aosp

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 230a0af..319a73a 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -171,13 +171,9 @@
                 // releases, exclude qtaguid.cpp from the VNDK-SP variant.
                 "qtaguid.cpp",
             ],
-        },
+        }
     },
 
-    defaults: [
-        "libprocessgroup_impl_provider",
-    ],
-
     shared_libs: [
         "liblog",
         "libbase",
@@ -186,9 +182,11 @@
         "libbase_headers",
         "libcutils_headers",
         "libutils_headers",
+        "libprocessgroup_headers",
     ],
     export_header_lib_headers: [
         "libcutils_headers",
+        "libprocessgroup_headers",
     ],
     local_include_dirs: ["include"],
 

libprocessgroup/Android.bp

diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
index a2da57c..618a5c5 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -15,58 +15,29 @@
     },
 }
 
-// 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

diff --git a/logcat/Android.bp b/logcat/Android.bp
index 0543aba..5030b15 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"],