From b4cb1b44c9a82dc18efae442dc06a8e0425e407b Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 10 Jul 2017 16:06:20 -0700 Subject: [PATCH] Couple libbatteryservice headers with module. Also moved these headers to be local to the service. Test: used headers with BOARD_VNDK_VERSION=current Bug: 37342627 Change-Id: I1d8142ff53036e99cf509a22855928248c29a924 --- include/batteryservice | 1 + services/batteryservice/Android.bp | 13 ++++++++++++- .../batteryservice/include}/batteryservice/BatteryService.h | 0 .../include}/batteryservice/BatteryServiceConstants.h | 0 .../include}/batteryservice/IBatteryPropertiesListener.h | 0 .../include}/batteryservice/IBatteryPropertiesRegistrar.h | 0 6 files changed, 13 insertions(+), 1 deletion(-) create mode 120000 include/batteryservice rename {include => services/batteryservice/include}/batteryservice/BatteryService.h (100%) rename {include => services/batteryservice/include}/batteryservice/BatteryServiceConstants.h (100%) rename {include => services/batteryservice/include}/batteryservice/IBatteryPropertiesListener.h (100%) rename {include => services/batteryservice/include}/batteryservice/IBatteryPropertiesRegistrar.h (100%) diff --git a/include/batteryservice b/include/batteryservice new file mode 120000 index 0000000000..2178c32092 --- /dev/null +++ b/include/batteryservice @@ -0,0 +1 @@ +../services/batteryservice/include/batteryservice/ \ No newline at end of file diff --git a/services/batteryservice/Android.bp b/services/batteryservice/Android.bp index e441bdafed..4c7265b654 100644 --- a/services/batteryservice/Android.bp +++ b/services/batteryservice/Android.bp @@ -1,3 +1,11 @@ +cc_library_headers { + name: "libbatteryservice_headers", + vendor_available: true, + export_include_dirs: ["include"], + header_libs: ["libbinder_headers"], + export_header_lib_headers: ["libbinder_headers"], +} + cc_library { name: "libbatteryservice", @@ -8,6 +16,9 @@ cc_library { "IBatteryPropertiesRegistrar.cpp", ], + header_libs: ["libbatteryservice_headers"], + export_header_lib_headers: ["libbatteryservice_headers"], + shared_libs: [ "libutils", "libbinder", @@ -19,4 +30,4 @@ cc_library { "-Wunused", "-Wunreachable-code", ], -} \ No newline at end of file +} diff --git a/include/batteryservice/BatteryService.h b/services/batteryservice/include/batteryservice/BatteryService.h similarity index 100% rename from include/batteryservice/BatteryService.h rename to services/batteryservice/include/batteryservice/BatteryService.h diff --git a/include/batteryservice/BatteryServiceConstants.h b/services/batteryservice/include/batteryservice/BatteryServiceConstants.h similarity index 100% rename from include/batteryservice/BatteryServiceConstants.h rename to services/batteryservice/include/batteryservice/BatteryServiceConstants.h diff --git a/include/batteryservice/IBatteryPropertiesListener.h b/services/batteryservice/include/batteryservice/IBatteryPropertiesListener.h similarity index 100% rename from include/batteryservice/IBatteryPropertiesListener.h rename to services/batteryservice/include/batteryservice/IBatteryPropertiesListener.h diff --git a/include/batteryservice/IBatteryPropertiesRegistrar.h b/services/batteryservice/include/batteryservice/IBatteryPropertiesRegistrar.h similarity index 100% rename from include/batteryservice/IBatteryPropertiesRegistrar.h rename to services/batteryservice/include/batteryservice/IBatteryPropertiesRegistrar.h -- 2.11.0