Rename PackageNameResolver to PackageInfoResolver.
Also move PackageInfoResolver out of the utils directory as there is
cross dependency with WatchdogServiceHelper.
Test: Tested with unit tests.
Bug: 167240592
Bug: 168155311
Change-Id: Ided1e999124ad472a346af151fe47711bffacb84
Merged-In: Ided1e999124ad472a346af151fe47711bffacb84
(cherry picked from commit cd5bca67ae73e8a5ec6584efab5b6d5f3ea5cad2)
diff --git a/cpp/watchdog/server/Android.bp b/cpp/watchdog/server/Android.bp
index c0b1c3b..b6f1ae8 100644
--- a/cpp/watchdog/server/Android.bp
+++ b/cpp/watchdog/server/Android.bp
@@ -42,9 +42,9 @@
}
cc_library {
- name: "libwatchdog_utils",
+ name: "libwatchdog_package_info_resolver",
srcs: [
- "src/utils/PackageNameResolver.cpp",
+ "src/PackageInfoResolver.cpp",
],
defaults: [
"carwatchdogd_defaults",
@@ -53,7 +53,7 @@
"libcutils",
],
export_include_dirs: [
- "src/utils",
+ "src",
],
}
@@ -62,7 +62,7 @@
shared_libs: [
"libcutils",
"libprocessgroup",
- "libwatchdog_utils",
+ "libwatchdog_package_info_resolver",
],
}
@@ -102,7 +102,7 @@
"tests/IoOveruseConfigsTest.cpp",
"tests/IoPerfCollectionTest.cpp",
"tests/LooperStub.cpp",
- "tests/PackageNameResolverTest.cpp",
+ "tests/PackageInfoResolverTest.cpp",
"tests/ProcPidDir.cpp",
"tests/ProcPidStatTest.cpp",
"tests/ProcStatTest.cpp",
@@ -119,7 +119,7 @@
"libwatchdog_binder_mediator",
"libwatchdog_perf_service",
"libwatchdog_process_service",
- "libwatchdog_utils",
+ "libwatchdog_package_info_resolver",
],
}
@@ -178,7 +178,7 @@
"libwatchdog_binder_mediator",
"libwatchdog_perf_service",
"libwatchdog_process_service",
- "libwatchdog_utils",
+ "libwatchdog_package_info_resolver",
],
vintf_fragments: ["carwatchdogd.xml"],
}