Merge "NNAPI Combine Compatability test with VTS test" (bc4c63c4) · Commits · e / os / android_hardware_interfaces

neuralnetworks/1.1/vts/functional/Android.bp

+2 −10

Original line number	Diff line number	Diff line
		@@ -45,16 +45,6 @@ cc_defaults {
		test_suites: ["general-tests"],
		}

		// Tests for V1_0 models using the V1_1 HAL.
		cc_test {
		name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest",
		defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		],
		}

		// Tests for V1_1 models.
		cc_test {
		name: "VtsHalNeuralnetworksV1_1TargetTest",
		defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],
		@@ -62,6 +52,7 @@ cc_test {
		"BasicTests.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		"neuralnetworks_generated_V1_1_example",
		],
		}
		@@ -73,6 +64,7 @@ cc_test {
		"BasicTests.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		"neuralnetworks_generated_V1_1_example",
		],
		cflags: [

+4 −27

Original line number	Diff line number	Diff line
		@@ -48,41 +48,17 @@ cc_defaults {
		test_suites: ["general-tests"],
		}

		// Tests for V1_0 models using the V1_2 HAL.
		cc_test {
		name: "VtsHalNeuralnetworksV1_2CompatV1_0TargetTest",
		defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
		srcs: [
		"ValidateBurst.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		],
		}

		// Tests for V1_1 models using the V1_2 HAL.
		cc_test {
		name: "VtsHalNeuralnetworksV1_2CompatV1_1TargetTest",
		defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
		srcs: [
		"ValidateBurst.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_1_example",
		],
		}

		// Tests for V1_2 models.
		cc_test {
		name: "VtsHalNeuralnetworksV1_2TargetTest",
		defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
		srcs: [
		"BasicTests.cpp",
		":VtsHalNeuralNetworksV1_2_mobilenets",
		"CompilationCachingTests.cpp",
		"ValidateBurst.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		"neuralnetworks_generated_V1_1_example",
		"neuralnetworks_generated_V1_2_example",
		],
		}
		@@ -92,11 +68,12 @@ cc_test {
		defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
		srcs: [
		"BasicTests.cpp",
		":VtsHalNeuralNetworksV1_2_mobilenets",
		"CompilationCachingTests.cpp",
		"ValidateBurst.cpp",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",
		"neuralnetworks_generated_V1_1_example",
		"neuralnetworks_generated_V1_2_example",
		],
		cflags: [