Revert "libprocessgroup users use libcutils"
This reverts commit 1ec3b78b6739caf0d855048a304c70349611a9b0.
Reason for revert: breaks all camera use cases
Bug: 135568875
Exempt-From-Owner-Approval: revert, no build cop
Change-Id: Iec8e1f94f5bedced3f3faf73f851fd2f13e2e768
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index df07d29..619bc56 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -169,13 +169,9 @@
// releases, exclude qtaguid.cpp from the VNDK-SP variant.
"qtaguid.cpp",
],
- },
+ }
},
- defaults: [
- "libprocessgroup_impl_provider",
- ],
-
shared_libs: [
"liblog",
"libbase",
@@ -184,9 +180,11 @@
"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 f486d6c..0207a75 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -14,8 +14,13 @@
},
}
-// TODO: remove all usages
cc_library {
+ srcs: [
+ "cgroup_map.cpp",
+ "processgroup.cpp",
+ "sched_policy.cpp",
+ "task_profiles.cpp",
+ ],
name: "libprocessgroup",
host_supported: true,
recovery_available: true,
@@ -24,47 +29,13 @@
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",
+ shared_libs: [
+ "libbase",
+ "libcgrouprc",
],
- host_supported: true,
- recovery_available: true,
- vendor_available: true,
+ static_libs: [
+ "libjsoncpp",
+ ],
// for cutils/android_filesystem_config.h
header_libs: [
"libcutils_headers",
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"],