Snap for 7318334 from f73898336a3d74dd319f451b938883f149dfda77 to sc-v2-release (f0746ff4) · Commits · e / os / android_system_core

libprocessgroup/cgrouprc/Android.bp

+3 −10

Original line number	Diff line number	Diff line
		@@ -28,7 +28,9 @@ cc_library {
		// defined below. The static library is built for tests.
		vendor_available: false,
		native_bridge_supported: true,
		llndk_stubs: "libcgrouprc.llndk",
		llndk: {
		symbol_file: "libcgrouprc.map.txt",
		},
		srcs: [
		"cgroup_controller.cpp",
		"cgroup_file.cpp",
		@@ -59,12 +61,3 @@ cc_library {
		},
		},
		}

		llndk_library {
		name: "libcgrouprc.llndk",
		symbol_file: "libcgrouprc.map.txt",
		native_bridge_supported: true,
		export_include_dirs: [
		"include",
		],
		}

+10 −6

Original line number	Diff line number	Diff line
		@@ -159,10 +159,9 @@ static int getCGroupSubsys(int tid, const char* subsys, std::string& subgroup) {

		if (!controller.IsUsable()) return -1;

		if (!controller.GetTaskGroup(tid, &subgroup)) {
		LOG(ERROR) << "Failed to find cgroup for tid " << tid;
		if (!controller.GetTaskGroup(tid, &subgroup))
		return -1;
		}

		return 0;
		}

		@@ -174,11 +173,16 @@ int get_sched_policy(int tid, SchedPolicy* policy) {
		std::string group;
		if (schedboost_enabled()) {
		if ((getCGroupSubsys(tid, "schedtune", group) < 0) &&
		(getCGroupSubsys(tid, "cpu", group) < 0))
		(getCGroupSubsys(tid, "cpu", group) < 0)) {
		LOG(ERROR) << "Failed to find cpu cgroup for tid " << tid;
		return -1;
		}
		}
		if (group.empty() && cpusets_enabled()) {
		if (getCGroupSubsys(tid, "cpuset", group) < 0) return -1;
		if (getCGroupSubsys(tid, "cpuset", group) < 0) {
		LOG(ERROR) << "Failed to find cpuset cgroup for tid " << tid;
		return -1;
		}
		}

		// TODO: replace hardcoded directories

+3 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,9 @@ cc_library {
		recovery_available: true,
		native_bridge_supported: true,
		defaults: ["libsync_defaults"],
		llndk_stubs: "libsync.llndk",
		llndk: {
		symbol_file: "libsync.map.txt",
		},
		stubs: {
		symbol_file: "libsync.map.txt",
		versions: [
		@@ -51,12 +53,6 @@ cc_library {
		},
		}

		llndk_library {
		name: "libsync.llndk",
		symbol_file: "libsync.map.txt",
		export_include_dirs: ["include"],
		}

		cc_test {
		name: "sync-unit-tests",
		shared_libs: ["libsync"],

+3 −8

Original line number	Diff line number	Diff line
		@@ -5,7 +5,9 @@ package {
		cc_library {
		name: "libvndksupport",
		native_bridge_supported: true,
		llndk_stubs: "libvndksupport.llndk",
		llndk: {
		symbol_file: "libvndksupport.map.txt",
		},
		srcs: ["linker.cpp"],
		cflags: [
		"-Wall",
		@@ -23,10 +25,3 @@ cc_library {
		versions: ["29"],
		},
		}

		llndk_library {
		name: "libvndksupport.llndk",
		native_bridge_supported: true,
		symbol_file: "libvndksupport.map.txt",
		export_include_dirs: ["include"],
		}