Merge "vibrator: use package as name" (8aa0dd83) · Commits · e / os / android_hardware_interfaces

tests/extension/vibrator/aidl/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		aidl_interface {
		// This is an example test interface showing how to add functionality
		// with setExtension/getExtension
		name: "test-vintf-vibrator-ext",
		name: "test-android.hardware.vibrator-ext",
		vendor_available: true,
		srcs: [
		// Using android.hardware as the package because this is in
		@@ -18,7 +18,7 @@ aidl_interface {
		// This happens to use types from a core interface, so we import it, but
		// this won't always be needed.
		imports: [
		"vintf-vibrator",
		"android.hardware.vibrator",
		],

		backend: {

+13 −15

Original line number	Diff line number	Diff line

		// This example client is written as a test, but it is executing from a system
		// context. All this code would look the same if it was running in system
		// server for example.

		cc_test {
		name: "test-vintf-vibrator-ext-client",
		name: "test-android.hardware.vibrator-ext-client",
		srcs: [
		// system code has the option to use the unstable C++ libbinder API
		// or the NDK one. For maximum code portability, using the ndk client
		@@ -15,12 +14,11 @@ cc_test {
		shared_libs: [
		"libbinder",
		"libutils",
		"vintf-vibrator-cpp",
		"test-vintf-vibrator-ext-cpp",
		"android.hardware.vibrator-cpp",
		"test-android.hardware.vibrator-ext-cpp",

		"libbinder_ndk",
		"vintf-vibrator-ndk_platform",
		"test-vintf-vibrator-ext-ndk_platform",
		"android.hardware.vibrator-ndk_platform",
		"test-android.hardware.vibrator-ext-ndk_platform",
		],
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ cc_binary {
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"vintf-vibrator-ndk_platform",
		"test-vintf-vibrator-ext-ndk_platform",
		"android.hardware.vibrator-ndk_platform",
		"test-android.hardware.vibrator-ext-ndk_platform",
		],
		}

+1 −1

Original line number	Diff line number	Diff line
		aidl_interface {
		name: "vintf-vibrator",
		name: "android.hardware.vibrator",
		vendor_available: true,
		srcs: [
		"android/hardware/vibrator/*.aidl",

+4 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ cc_library_static {
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"vintf-vibrator-ndk_platform",
		"android.hardware.vibrator-ndk_platform",
		],
		export_include_dirs: ["include"],
		srcs: ["Vibrator.cpp"],
		@@ -23,7 +23,7 @@ cc_binary {
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"vintf-vibrator-ndk_platform",
		"android.hardware.vibrator-ndk_platform",
		],
		static_libs: [
		"libvibratorexampleimpl",