Merge "Media omx tests static link to dependencies." into oc-mr1-dev (24ea76c3) · Commits · e / os / android_hardware_interfaces

media/omx/1.0/vts/functional/audio/Android.bp

+8 −54

Original line number	Diff line number	Diff line
		@@ -16,65 +16,19 @@

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetAudioEncTest",
		defaults: ["hidl_defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetAudioEncTest.cpp",
		"media_audio_hidl_test_common.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		"libutils",
		"libstagefright_foundation",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase",
		"VtsHalMediaOmxV1_0CommonUtil"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: [
		"VtsHalMediaOmxV1_0TargetAudioEncTest.cpp",
		"media_audio_hidl_test_common.cpp"
		],
		}

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetAudioDecTest",
		defaults: ["hidl_defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetAudioDecTest.cpp",
		"media_audio_hidl_test_common.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		"libutils",
		"libstagefright_foundation",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase",
		"VtsHalMediaOmxV1_0CommonUtil"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: [
		"VtsHalMediaOmxV1_0TargetAudioDecTest.cpp",
		"media_audio_hidl_test_common.cpp"
		],
		}

media/omx/1.0/vts/functional/common/Android.bp

+29 −7

Original line number	Diff line number	Diff line
		@@ -16,18 +16,40 @@

		cc_library_static {
		name: "VtsHalMediaOmxV1_0CommonUtil",
		defaults: ["hidl_defaults"],
		srcs: ["media_hidl_test_common.cpp"],
		shared_libs: [
		"liblog",

		header_libs: ["media_plugin_headers"],
		export_header_lib_headers: ["media_plugin_headers"],
		export_include_dirs: ["."],

		static_libs: [
		"VtsHalHidlTargetTestBase",
		"libhidlmemory",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase"],
		cflags: [ "-O0", "-g", ],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		}

		cc_defaults {
		name: "VtsHalMediaOmxV1_0Defaults",
		defaults: ["VtsHalTargetTestDefaults"],

		// Link to these statically as they are not guaranteed to be on the device.
		static_libs: [
		"VtsHalMediaOmxV1_0CommonUtil",
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.common@1.0",
		"android.hardware.media.omx@1.0",
		"android.hardware.media@1.0",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"libhidlmemory",
		"libnativehelper",
		],

		// TODO(b/64437680): Assume these libs are always available on the device.
		shared_libs: [
		"libstagefright_foundation",
		],
		}

media/omx/1.0/vts/functional/component/Android.bp

+1 −26

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

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetComponentTest",
		defaults: ["hidl_defaults"],
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetComponentTest.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		"libutils",
		"libstagefright_foundation",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase",
		"VtsHalMediaOmxV1_0CommonUtil"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		],
		}

media/omx/1.0/vts/functional/master/Android.bp

+1 −23

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

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetMasterTest",
		defaults: ["hidl_defaults"],
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetMasterTest.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		"libutils",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		],
		}

media/omx/1.0/vts/functional/video/Android.bp

+12 −56

Original line number	Diff line number	Diff line
		@@ -16,70 +16,26 @@

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetVideoDecTest",
		defaults: ["hidl_defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetVideoDecTest.cpp",
		"media_video_hidl_test_common.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		"libutils",
		"libstagefright_foundation",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: [
		"VtsHalMediaOmxV1_0TargetVideoDecTest.cpp",
		"media_video_hidl_test_common.cpp"
		],
		static_libs: [
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.common@1.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase",
		"VtsHalMediaOmxV1_0CommonUtil"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		],
		}

		cc_test {
		name: "VtsHalMediaOmxV1_0TargetVideoEncTest",
		defaults: ["hidl_defaults"],
		srcs: ["VtsHalMediaOmxV1_0TargetVideoEncTest.cpp",
		"media_video_hidl_test_common.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libnativehelper",
		defaults: ["VtsHalMediaOmxV1_0Defaults"],
		srcs: [
		"VtsHalMediaOmxV1_0TargetVideoEncTest.cpp",
		"media_video_hidl_test_common.cpp"
		],
		static_libs: [
		"libnativewindow",
		"libutils",
		"libstagefright_foundation",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.mapper@2.0",
		],
		static_libs: ["VtsHalHidlTargetTestBase",
		"VtsHalMediaOmxV1_0CommonUtil"],
		cflags: [
		"-O0",
		"-g",
		],
		include_dirs: [
		"frameworks/native/include/media/openmax/",
		"hardware/interfaces/media/omx/1.0/vts/functional/common",
		],
		}