From ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 26 Feb 2020 17:00:39 +0000 Subject: 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 Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853 Signed-off-by: Kevin May --- androidnn.go | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 androidnn.go (limited to 'androidnn.go') 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 -} -- cgit v1.2.1