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

Commit 6d588b7c authored Feb 24, 2022 by Michael Butler Committed by Automerger Merge Worker Feb 24, 2022

Merge "Remove NN host specific build defines" am: fe9368b7 am: 13a6d166

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1997731

Change-Id: Ic3f1a18b4af1b4280f1cd746218b807a5e2a30cc

parents 581616e6 13a6d166

neuralnetworks/1.2/utils/Android.bp

+0 −10

Original line number	Diff line number	Diff line
		@@ -45,16 +45,6 @@ cc_library_static {
		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 {

neuralnetworks/1.3/utils/Android.bp

+0 −10

Original line number	Diff line number	Diff line
		@@ -42,16 +42,6 @@ cc_library_static {
		"neuralnetworks_utils_hal_1_1",
		"neuralnetworks_utils_hal_1_2",
		],
		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 {

neuralnetworks/aidl/utils/Android.bp

+0 −8

Original line number	Diff line number	Diff line
		@@ -127,14 +127,6 @@ cc_test {
		android: {
		shared_libs: ["libnativewindow"],
		},
		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",
		],
		},
		},
		cflags: [
		/* GMOCK defines functions for printing all MOCK_DEVICE arguments and