Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3afd40e authored Mar 12, 2018 by Kevin Rocard

Audio V4: Update V2 tests to V4



Bug: 74037175
Bug: 38184704
Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target
Change-Id: Ic8da941fc042b7ef838edf8fdac36b2f0fa1fd32
Signed-off-by: Kevin Rocard <krocard@google.com>

parent 8532f6b2

audio/common/all-versions/util/include/common/all-versions/VersionUtils.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,12 @@ auto mkEnumConverter(Source source) {
	return EnumConverter<Source, Destination>{source};		return EnumConverter<Source, Destination>{source};
	}		}

			/** Allows converting an enum to its bitfield or itself. */
			template <class Enum>
			EnumConverter<Enum> mkBitfield(Enum value) {
			return EnumConverter<Enum>{value};
			}

	} // namespace utils		} // namespace utils
	} // namespace common		} // namespace common
	} // namespace audio		} // namespace audio

audio/core/4.0/vts/functional/Android.bp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,11 +23,14 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"android.hardware.audio.common.test.utility",		"android.hardware.audio.common.test.utility",
	"android.hardware.audio@2.0",		"android.hardware.audio@4.0",
	"android.hardware.audio.common@2.0",		"android.hardware.audio.common@4.0",
	"libxml2",		"libxml2",
	],		],
	shared_libs: [		shared_libs: [
	"libicuuc",		"libicuuc",
	],		],
			header_libs: [
			"android.hardware.audio.common.util@all-versions",
			],
	}		}

audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp

+147 −103

File changed.

Preview size limit exceeded, changes collapsed.

audio/effect/4.0/vts/functional/Android.bp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,8 +23,8 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"android.hardware.audio.common.test.utility",		"android.hardware.audio.common.test.utility",
	"android.hardware.audio.common@2.0",		"android.hardware.audio.common@4.0",
	"android.hardware.audio.effect@2.0",		"android.hardware.audio.effect@4.0",
	"android.hidl.allocator@1.0",		"android.hidl.allocator@1.0",
	"android.hidl.memory@1.0",		"android.hidl.memory@1.0",
	"libxml2",		"libxml2",
	@@ -33,4 +33,7 @@ cc_test {
	"libeffectsconfig",		"libeffectsconfig",
	"libicuuc",		"libicuuc",
	],		],
			header_libs: [
			"android.hardware.audio.common.util@all-versions",
			],
	}		}

audio/effect/4.0/vts/functional/ValidateAudioEffectsConfiguration.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,5 +28,5 @@ TEST(CheckConfig, audioEffectsConfigurationValidation) {

	std::vector<const char*> locations(std::begin(DEFAULT_LOCATIONS), std::end(DEFAULT_LOCATIONS));		std::vector<const char*> locations(std::begin(DEFAULT_LOCATIONS), std::end(DEFAULT_LOCATIONS));
	EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(DEFAULT_NAME, locations,		EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(DEFAULT_NAME, locations,
	"/data/local/tmp/audio_effects_conf_V2_0.xsd");		"/data/local/tmp/audio_effects_conf_V4_0.xsd");
	}		}