diff options
| author | Lakshman Annadorai <lakshmana@google.com> | 2021-10-08 16:45:16 -0700 |
|---|---|---|
| committer | Lakshman Annadorai <lakshmana@google.com> | 2021-10-13 21:46:21 +0000 |
| commit | 15bc80db8f43378f2d11e2d47c963504f5c903d4 (patch) | |
| tree | 86d2a1d9b6e7e8b521d1892b2a83edf6984ef940 /cpp/watchdog | |
| parent | 6a4d03941b54459985b64ea410a2f7a655a259b8 (diff) | |
| download | Car-15bc80db8f43378f2d11e2d47c963504f5c903d4.tar.gz | |
Link internal libraries as static_libs or whole_static_libs.
- Link VHal HIDL as whole static lib in the test binary.
This requires removing the HIDL dependency as shared lib from
carwatchdog defaults.
Test: atest libwatchdog_test
Fix: 202443874
Change-Id: Iaffe71ae9ad4a4f5e6da3ba0af72d817977c5baa
Merged-In: Iaffe71ae9ad4a4f5e6da3ba0af72d817977c5baa
Diffstat (limited to 'cpp/watchdog')
| -rw-r--r-- | cpp/watchdog/server/Android.bp | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/cpp/watchdog/server/Android.bp b/cpp/watchdog/server/Android.bp index c8d07b4626..5aeebb24ce 100644 --- a/cpp/watchdog/server/Android.bp +++ b/cpp/watchdog/server/Android.bp @@ -30,16 +30,15 @@ cc_defaults { "system/libbase/include", ], shared_libs: [ - "android.automotive.watchdog-V3-cpp", - "android.automotive.watchdog.internal-cpp", - "android.automotive.watchdog.internal-cpp", - "android.automotive.watchdog-V3-cpp", - "android.hardware.automotive.vehicle@2.0", "libbase", "libbinder", "liblog", "libutils", ], + static_libs: [ + "android.automotive.watchdog.internal-cpp", + "android.automotive.watchdog-V3-cpp", + ], header_libs: [ "libgtest_prod_headers", ], @@ -54,6 +53,7 @@ cc_library { "carwatchdogd_defaults", ], shared_libs: [ + "android.hardware.automotive.vehicle@2.0", "libcutils", ], export_include_dirs: [ @@ -67,7 +67,6 @@ cc_defaults { "libcutils", "libprocessgroup", "libtinyxml2", - "libwatchdog_package_info_resolver", ], } @@ -90,8 +89,12 @@ cc_library { "src/UidProcStatsCollector.cpp", "src/UidStatsCollector.cpp", ], + shared_libs: [ + "android.hardware.automotive.vehicle@2.0", + ], whole_static_libs: [ "libwatchdog_properties", + "libwatchdog_package_info_resolver", ], export_include_dirs: [ "src", @@ -140,7 +143,10 @@ cc_test { "libwatchdog_binder_mediator", "libwatchdog_perf_service", "libwatchdog_process_service", + ], + whole_static_libs: [ "libwatchdog_package_info_resolver", + "android.hardware.automotive.vehicle@2.0", ], data: [":watchdog_test_xml_files"], } @@ -161,6 +167,9 @@ cc_library { "carwatchdogd_defaults", "libwatchdog_process_service_defaults" ], + shared_libs: [ + "android.hardware.automotive.vehicle@2.0", + ], } cc_library { @@ -176,6 +185,9 @@ cc_library { "src/WatchdogServiceHelper.cpp", ], shared_libs: [ + "android.hardware.automotive.vehicle@2.0", + ], + static_libs: [ "libwatchdog_perf_service", "libwatchdog_process_service", ], @@ -197,10 +209,15 @@ cc_binary { ], init_rc: ["carwatchdogd.rc"], shared_libs: [ - "libwatchdog_binder_mediator", - "libwatchdog_perf_service", - "libwatchdog_process_service", - "libwatchdog_package_info_resolver", + "android.hardware.automotive.vehicle@2.0", + ], + static_libs: [ + "libwatchdog_binder_mediator", + "libwatchdog_perf_service", + "libwatchdog_process_service", + ], + whole_static_libs: [ + "libwatchdog_package_info_resolver", ], vintf_fragments: ["carwatchdogd.xml"], required: [ |