Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80 am: 3b84dc5c78 am: 84d1627979 (f6cfef14) · Commits · e / os / android_hardware_interfaces

Android.bp

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,3 +9,26 @@ cc_defaults {
	"-Werror",		"-Werror",
	],		],
	}		}

			cc_defaults {
			name: "VtsHalTargetTestDefaults",
			defaults: ["hidl_defaults"],
			static_libs: [
			"VtsHalHidlTargetTestBase",
			],
			group_static_libs: true,
			shared_libs: [
			"libbase",
			"libcutils",
			"liblog",
			"libhidlbase",
			"libhidltransport",
			"libhwbinder",
			"libutils",
			],
			cflags: [
			"-O0",
			"-g",
			],

			}

bluetooth/1.0/vts/functional/Android.bp

+2 −16

Original line number	Original line	Diff line number	Diff line
	@@ -16,24 +16,10 @@

	cc_test {		cc_test {
	name: "VtsHalBluetoothV1_0TargetTest",		name: "VtsHalBluetoothV1_0TargetTest",
	defaults: ["hidl_defaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"],		srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"],
	shared_libs: [
	"libbase",
	"liblog",
	"libcutils",
	"libhidlbase",
	"libhidltransport",
	"libnativehelper",
	"libutils",
	"android.hardware.bluetooth@1.0",
	],
	static_libs: [		static_libs: [
	"VtsHalHidlTargetTestBase",		"android.hardware.bluetooth@1.0",
	"libbluetooth-types",		"libbluetooth-types",
	],		],
	cflags: [
	"-O0",
	"-g",
	],
	}		}

ir/1.0/vts/functional/Android.bp

+2 −13

Original line number	Original line	Diff line number	Diff line
	@@ -16,20 +16,9 @@

	cc_test {		cc_test {
	name: "VtsHalIrV1_0TargetTest",		name: "VtsHalIrV1_0TargetTest",
	defaults: ["hidl_defaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["VtsHalIrV1_0TargetTest.cpp"],		srcs: ["VtsHalIrV1_0TargetTest.cpp"],
	shared_libs: [		static_libs: [
	"libbase",
	"liblog",
	"libcutils",
	"libhidlbase",
	"libhidltransport",
	"libutils",
	"android.hardware.ir@1.0",		"android.hardware.ir@1.0",
	],		],
	static_libs: ["VtsHalHidlTargetTestBase"],
	cflags: [
	"-O0",
	"-g",
	],
	}		}

nfc/1.0/vts/functional/Android.bp

+2 −14

Original line number	Original line	Diff line number	Diff line
	@@ -16,21 +16,9 @@

	cc_test {		cc_test {
	name: "VtsHalNfcV1_0TargetTest",		name: "VtsHalNfcV1_0TargetTest",
	defaults: ["hidl_defaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["VtsHalNfcV1_0TargetTest.cpp"],		srcs: ["VtsHalNfcV1_0TargetTest.cpp"],
	shared_libs: [		static_libs: [
	"libbase",
	"liblog",
	"libcutils",
	"libhidlbase",
	"libhidltransport",
	"libnativehelper",
	"libutils",
	"android.hardware.nfc@1.0",		"android.hardware.nfc@1.0",
	],		],
	static_libs: ["VtsHalHidlTargetTestBase"],
	cflags: [
	"-O0",
	"-g",
	],
	}		}

radio/1.0/vts/functional/Android.bp

+5 −29

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	cc_test {		cc_test {
	name: "VtsHalRadioV1_0TargetTest",		name: "VtsHalRadioV1_0TargetTest",
	defaults: ["hidl_defaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["radio_hidl_hal_cell_broadcast.cpp",		srcs: ["radio_hidl_hal_cell_broadcast.cpp",
	"radio_hidl_hal_data.cpp",		"radio_hidl_hal_data.cpp",
	"radio_hidl_hal_icc.cpp",		"radio_hidl_hal_icc.cpp",
	@@ -30,46 +30,22 @@ cc_test {
	"radio_response.cpp",		"radio_response.cpp",
	"VtsHalRadioV1_0TargetTest.cpp",		"VtsHalRadioV1_0TargetTest.cpp",
	"vts_test_util.cpp"],		"vts_test_util.cpp"],
	shared_libs: [		static_libs: [
	"libbase",
	"liblog",
	"libcutils",
	"libhidlbase",
	"libhidltransport",
	"libnativehelper",
	"libutils",
	"android.hardware.radio@1.0",		"android.hardware.radio@1.0",
	],		],
	static_libs: ["VtsHalHidlTargetTestBase"],
	cflags: [
	"-O0",
	"-g",
	],
	}		}

	cc_test {		cc_test {
	name: "VtsHalSapV1_0TargetTest",		name: "VtsHalSapV1_0TargetTest",
	defaults: ["hidl_defaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["sap_callback.cpp",		srcs: ["sap_callback.cpp",
	"sap_hidl_hal_api.cpp",		"sap_hidl_hal_api.cpp",
	"sap_hidl_hal_test.cpp",		"sap_hidl_hal_test.cpp",
	"VtsHalSapV1_0TargetTest.cpp",		"VtsHalSapV1_0TargetTest.cpp",
	"vts_test_util.cpp"],		"vts_test_util.cpp"],
	shared_libs: [		static_libs: [
	"libbase",
	"liblog",
	"libcutils",
	"libhidlbase",
	"libhidltransport",
	"libnativehelper",
	"libutils",
	"android.hardware.radio@1.0",		"android.hardware.radio@1.0",
	],		],
	static_libs: ["VtsHalHidlTargetTestBase"],
	cflags: [
	"-O0",
	"-g",
	],
	}		}

	cc_library_static {		cc_library_static {