ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "libprocessgroup users use libcutils"

Browse source 
am: 5360a8492d

Change-Id: I3cd5a95311ea42a1dc3ea235790f909e4da6a7e0
This commit is contained in:
Zhijun He 2019-06-18 22:50:55 -07:00 • committed by android-build-merger
commit 5e1c51498b
3 changed files with 16 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libcutils/Android.bp
View file

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

53
libprocessgroup/Android.bp
View file

@ -14,8 +14,13 @@ cc_library_headers {
}, },
} }
// TODO: remove all usages
cc_library { cc_library {
srcs: [
"cgroup_map.cpp",
"processgroup.cpp",
"sched_policy.cpp",
"task_profiles.cpp",
],
name: "libprocessgroup", name: "libprocessgroup",
host_supported: true, host_supported: true,
recovery_available: true, recovery_available: true,
@ -24,47 +29,13 @@ cc_library {
enabled: true, enabled: true,
support_system_process: true, support_system_process: true,
}, },
} shared_libs: [
"libbase",
cc_defaults { "libcgrouprc",
name: "libprocessgroup_impl_libs", ],
target: { static_libs: [
linux: { "libjsoncpp",
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",
], ],
host_supported: true,
recovery_available: true,
vendor_available: true,
// for cutils/android_filesystem_config.h // for cutils/android_filesystem_config.h
header_libs: [ header_libs: [
"libcutils_headers", "libcutils_headers",

2
logcat/Android.bp
View file

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