Merge "libbinder - split out libbatterystats_aidl" am: 3d5d07b39f (f63578a6) · Commits · e / os / android_frameworks_native

libs/binder/Android.bp

+21 −1

Original line number	Diff line number	Diff line
		@@ -58,13 +58,13 @@ cc_library_headers {
		// transport itself and should be moved to AIDL or in domain-specific libs.
		//
		// Currently, these are only on system android (not vendor, not host)
		// TODO(b/183654927) - move these into separate libraries
		libbinder_device_interface_sources = [
		"ActivityManager.cpp",
		"AppOpsManager.cpp",
		"IActivityManager.cpp",
		"IAppOpsCallback.cpp",
		"IAppOpsService.cpp",
		"IBatteryStats.cpp",
		"IMediaResourceMonitor.cpp",
		"IPermissionController.cpp",
		"IProcessInfoService.cpp",
		@@ -265,3 +265,23 @@ aidl_interface {
		},
		},
		}

		// libbinder historically contained additional interfaces that provided specific
		// functionality in the platform but have nothing to do with binder itself. These
		// are moved out of libbinder in order to avoid the overhead of their vtables.
		// If you are working on or own one of these interfaces, the responsible things
		// to would be:
		// - give them a new home
		// - convert them to AIDL instead of having manually written parceling code

		cc_library {
		name: "libbatterystats_aidl",
		srcs: [
		"IBatteryStats.cpp",
		],
		export_include_dirs: ["include_batterystats"],
		shared_libs: [
		"libbinder",
		"libutils",
		],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include <binder/IBatteryStats.h>
		#include <batterystats/IBatteryStats.h>

		#include <utils/Log.h>
		#include <binder/Parcel.h>

+0 −0

File moved.

+1 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,6 @@ package {
		default_applicable_licenses: ["frameworks_native_license"],
		}

		subdirs = [
		"hidl"
		]
		cc_library_shared {
		name: "libsensorservice",

		@@ -52,6 +49,7 @@ cc_library_shared {
		"libhardware_legacy",
		"libutils",
		"liblog",
		"libbatterystats_aidl",
		"libbinder",
		"libsensor",
		"libsensorprivacy",

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		#include <stdint.h>
		#include <sys/types.h>

		#include <binder/IBatteryStats.h>
		#include <batterystats/IBatteryStats.h>
		#include <utils/Singleton.h>

		namespace android {