Merge "Graphics tests statically link to HAL definition libs." into oc-mr1-dev (43b3865a) · Commits · e / os / android_hardware_interfaces

graphics/composer/2.1/vts/functional/Android.bp

+8 −20

Original line number	Diff line number	Diff line
		@@ -44,33 +44,21 @@ cc_library_static {

		cc_test {
		name: "VtsHalGraphicsComposerV2_1TargetTest",
		defaults: ["hidl_defaults"],
		defaults: ["VtsHalTargetTestDefaults"],
		srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],

		// TODO(b/64437680): Assume these libs are always available on the device.
		shared_libs: [
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.composer@2.1",
		"android.hardware.graphics.mapper@2.0",
		"libbase",
		"libcutils",
		"libfmq",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libnativehelper",
		"libsync",
		"libutils",
		],
		static_libs: [
		"libhwcomposer-command-buffer",
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.composer@2.1",
		"android.hardware.graphics.mapper@2.0",
		"libVtsHalGraphicsComposerTestUtils",
		"libVtsHalGraphicsMapperTestUtils",
		"VtsHalHidlTargetTestBase",
		"libhwcomposer-command-buffer",
		"libnativehelper",
		],
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-O0",
		"-g",
		]
		}

+4 −18

Original line number	Diff line number	Diff line
		@@ -37,30 +37,16 @@ cc_library_static {

		cc_test {
		name: "VtsHalGraphicsMapperV2_0TargetTest",
		defaults: ["hidl_defaults"],
		defaults: ["VtsHalTargetTestDefaults"],
		srcs: ["VtsHalGraphicsMapperV2_0TargetTest.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidltransport",
		"libnativehelper",
		"libsync",
		"libutils",
		],
		static_libs: [
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.common@1.0",
		],
		static_libs: [
		"libVtsHalGraphicsMapperTestUtils",
		"VtsHalHidlTargetTestBase",
		"libnativehelper",
		],
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-O0",
		"-g",
		]
		}