Merge "Revert "Making NN hardware interface libs "host supported""" (e0b2d17c) · Commits · e / os / android_hardware_interfaces

neuralnetworks/1.0/utils/Android.bp

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,6 @@ cc_library_static {

	cc_test {		cc_test {
	name: "neuralnetworks_utils_hal_1_0_test",		name: "neuralnetworks_utils_hal_1_0_test",
	host_supported: true,
	srcs: ["test/*.cpp"],		srcs: ["test/*.cpp"],
	static_libs: [		static_libs: [
	"android.hardware.neuralnetworks@1.0",		"android.hardware.neuralnetworks@1.0",
	@@ -63,12 +62,8 @@ cc_test {
	"libhidlbase",		"libhidlbase",
	"libhidlmemory",		"libhidlmemory",
	"liblog",		"liblog",
			"libnativewindow",
	"libutils",		"libutils",
	],		],
	target: {
	android: {
	shared_libs: ["libnativewindow"],
	},
	},
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	}		}

+15 −9

Original line number	Original line	Diff line number	Diff line
	@@ -25,10 +25,19 @@ package {

	cc_defaults {		cc_defaults {
	name: "neuralnetworks_vts_functional_defaults",		name: "neuralnetworks_vts_functional_defaults",
	defaults: [		defaults: ["VtsHalTargetTestDefaults"],
	"VtsHalTargetTestDefaults",		arch: {
	"neuralnetworks_float16",		x86: {
	],		cflags: [ "-D_Float16=__fp16",
			"-Xclang", "-fnative-half-type",
			"-Xclang", "-fallow-half-arguments-and-returns" ],
			},
			x86_64: {
			cflags: [ "-D_Float16=__fp16",
			"-Xclang", "-fnative-half-type",
			"-Xclang", "-fallow-half-arguments-and-returns" ],
			},
			},
	}		}

	cc_library_static {		cc_library_static {
	@@ -74,7 +83,6 @@ cc_test {
	"libnativewindow",		"libnativewindow",
	],		],
	static_libs: [		static_libs: [
	"VtsHalNeuralNetworksV1_0_utils",
	"android.hardware.neuralnetworks@1.0",		"android.hardware.neuralnetworks@1.0",
	"android.hidl.allocator@1.0",		"android.hidl.allocator@1.0",
	"android.hidl.memory@1.0",		"android.hidl.memory@1.0",
	@@ -82,6 +90,7 @@ cc_test {
	"libhidlmemory",		"libhidlmemory",
	"libneuralnetworks_generated_test_harness",		"libneuralnetworks_generated_test_harness",
	"libneuralnetworks_utils",		"libneuralnetworks_utils",
			"VtsHalNeuralNetworksV1_0_utils",
	],		],
	whole_static_libs: [		whole_static_libs: [
	"neuralnetworks_generated_V1_0_example",		"neuralnetworks_generated_V1_0_example",
	@@ -89,8 +98,5 @@ cc_test {
	header_libs: [		header_libs: [
	"libneuralnetworks_headers",		"libneuralnetworks_headers",
	],		],
	test_suites: [		test_suites: ["general-tests", "vts"],
	"general-tests",
	"vts",
	],
	}		}

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,6 @@ cc_library_static {

	cc_test {		cc_test {
	name: "neuralnetworks_utils_hal_1_1_test",		name: "neuralnetworks_utils_hal_1_1_test",
	host_supported: true,
	srcs: ["test/*.cpp"],		srcs: ["test/*.cpp"],
	static_libs: [		static_libs: [
	"android.hardware.neuralnetworks@1.0",		"android.hardware.neuralnetworks@1.0",
	@@ -67,12 +66,8 @@ cc_test {
	"libhidlbase",		"libhidlbase",
	"libhidlmemory",		"libhidlmemory",
	"liblog",		"liblog",
			"libnativewindow",
	"libutils",		"libutils",
	],		],
	target: {
	android: {
	shared_libs: ["libnativewindow"],
	},
	},
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	}		}

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -28,19 +28,18 @@ cc_test {
	defaults: ["neuralnetworks_vts_functional_defaults"],		defaults: ["neuralnetworks_vts_functional_defaults"],
	srcs: [		srcs: [
	"BasicTests.cpp",		"BasicTests.cpp",
	"GeneratedTestHarness.cpp",
	"TestAssertions.cpp",		"TestAssertions.cpp",
	"TestMain.cpp",		"TestMain.cpp",
	"ValidateModel.cpp",		"ValidateModel.cpp",
	"ValidateRequest.cpp",		"ValidateRequest.cpp",
	"VtsHalNeuralnetworks.cpp",		"VtsHalNeuralnetworks.cpp",
			"GeneratedTestHarness.cpp",
	],		],
	shared_libs: [		shared_libs: [
	"libfmq",		"libfmq",
	"libnativewindow",		"libnativewindow",
	],		],
	static_libs: [		static_libs: [
	"VtsHalNeuralNetworksV1_0_utils",
	"android.hardware.neuralnetworks@1.0",		"android.hardware.neuralnetworks@1.0",
	"android.hardware.neuralnetworks@1.1",		"android.hardware.neuralnetworks@1.1",
	"android.hidl.allocator@1.0",		"android.hidl.allocator@1.0",
	@@ -49,6 +48,7 @@ cc_test {
	"libhidlmemory",		"libhidlmemory",
	"libneuralnetworks_generated_test_harness",		"libneuralnetworks_generated_test_harness",
	"libneuralnetworks_utils",		"libneuralnetworks_utils",
			"VtsHalNeuralNetworksV1_0_utils",
	],		],
	whole_static_libs: [		whole_static_libs: [
	"neuralnetworks_generated_V1_0_example",		"neuralnetworks_generated_V1_0_example",
	@@ -57,8 +57,5 @@ cc_test {
	header_libs: [		header_libs: [
	"libneuralnetworks_headers",		"libneuralnetworks_headers",
	],		],
	test_suites: [		test_suites: ["general-tests", "vts"],
	"general-tests",
	"vts",
	],
	}		}

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -50,21 +50,10 @@ cc_library_static {
	cflags: ["-DNN_DEBUGGABLE"],		cflags: ["-DNN_DEBUGGABLE"],
	},		},
	},		},
	target: {
	host: {
	cflags: [
	"-D__INTRODUCED_IN(x)=",
	"-D__assert(a,b,c)=",
	// We want all the APIs to be available on the host.
	"-D__ANDROID_API__=10000",
	],
	},
	},
	}		}

	cc_test {		cc_test {
	name: "neuralnetworks_utils_hal_1_2_test",		name: "neuralnetworks_utils_hal_1_2_test",
	host_supported: true,
	srcs: ["test/*.cpp"],		srcs: ["test/*.cpp"],
	static_libs: [		static_libs: [
	"android.hardware.neuralnetworks@1.0",		"android.hardware.neuralnetworks@1.0",
	@@ -87,12 +76,8 @@ cc_test {
	"libhidlbase",		"libhidlbase",
	"libhidlmemory",		"libhidlmemory",
	"liblog",		"liblog",
			"libnativewindow",
	"libutils",		"libutils",
	],		],
	target: {
	android: {
	shared_libs: ["libnativewindow"],
	},
	},
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	}		}