diff options
| author | Michael Butler <butlermichael@google.com> | 2022-02-24 02:18:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-24 02:18:15 +0000 |
| commit | 08d04aea58d3f3458b0f17a278d00287d75b061a (patch) | |
| tree | 2216093b289925add6f0e0fd1eec92894f2be17e /neuralnetworks | |
| parent | ca18b9661b74f6cfea804f243d29bfb639b0f829 (diff) | |
| parent | 6d588b7cd9b95df4924f1210576ae6a6ade31615 (diff) | |
Merge "Remove NN host specific build defines" am: fe9368b729 am: 13a6d16614 am: 6d588b7cd9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1997731
Change-Id: I2bfc9dbc8c7fbc0940eed48968dc5df89314b08c
Diffstat (limited to 'neuralnetworks')
| -rw-r--r-- | neuralnetworks/1.2/utils/Android.bp | 10 | ||||
| -rw-r--r-- | neuralnetworks/1.3/utils/Android.bp | 10 | ||||
| -rw-r--r-- | neuralnetworks/aidl/utils/Android.bp | 8 |
3 files changed, 0 insertions, 28 deletions
diff --git a/neuralnetworks/1.2/utils/Android.bp b/neuralnetworks/1.2/utils/Android.bp index 57450d9733..e7d514f65b 100644 --- a/neuralnetworks/1.2/utils/Android.bp +++ b/neuralnetworks/1.2/utils/Android.bp @@ -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 { diff --git a/neuralnetworks/1.3/utils/Android.bp b/neuralnetworks/1.3/utils/Android.bp index aa03fea01c..05413e6559 100644 --- a/neuralnetworks/1.3/utils/Android.bp +++ b/neuralnetworks/1.3/utils/Android.bp @@ -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 { diff --git a/neuralnetworks/aidl/utils/Android.bp b/neuralnetworks/aidl/utils/Android.bp index 4d524eed05..325809213c 100644 --- a/neuralnetworks/aidl/utils/Android.bp +++ b/neuralnetworks/aidl/utils/Android.bp @@ -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 |