diff options
author | Kevin May <kevin.may@arm.com> | 2020-02-26 17:00:39 +0000 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2020-03-03 08:40:23 +0000 |
commit | ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c (patch) | |
tree | ac4e2d3194012e08241afa9c6691d52608c1a869 /androidnn.go | |
parent | 4a9565870037150ad6ee060a3cd232d867711b60 (diff) | |
download | android-nn-driver-ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c.tar.gz |
IVGCVSW-4473 Android R pre Hal 1_3 build changes
* Update ErrorStatus to V1_0::ErrorStatus
* Update Request to V1_0::Request
* Update OperandType to V1_2::OperandType
* Add namespace android::nn::hal in ArmnnDriverImpl for R only
* Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName
* Add namespace V1_0 or V1_1 where necessary
* Update Android.mk with R macro and android.hardware.neuralnetworks@1.3
* Remove androidnn.go
* include IAllocator in DriverTestHelpers
* Remove unused LOCAL_CFLAGS
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to 'androidnn.go')
-rw-r--r-- | androidnn.go | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/androidnn.go b/androidnn.go deleted file mode 100644 index 92b7b2aa..00000000 --- a/androidnn.go +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright © 2017 ARM Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -package armnn_nn_driver - -import ( - "android/soong/android" - "android/soong/cc" -) - -func globalFlags(ctx android.BaseContext) []string { - var cppflags []string - - if ctx.AConfig().PlatformVersionName() == "Q" || ctx.AConfig().PlatformVersionName() == "10" { - cppflags = append(cppflags, "-fno-addrsig") - } - - return cppflags -} - -func armnnNNDriverDefaults(ctx android.LoadHookContext) { - type props struct { - Cppflags []string - } - - p := &props{} - p.Cppflags = globalFlags(ctx) - - ctx.AppendProperties(p) -} - -func init() { - - android.RegisterModuleType("armnn_nn_driver_defaults", armnnNNDriverDefaultsFactory) -} - -func armnnNNDriverDefaultsFactory() android.Module { - - module := cc.DefaultsFactory() - android.AddLoadHook(module, armnnNNDriverDefaults) - return module -} |