diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-22 18:00:30 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-22 18:00:30 +0100 |
commit | d6539c58519962acd8967e93ceb2da049631c832 (patch) | |
tree | fc1a324e5b2a757d6b9e26a721db362988c93dfe /Android.bp | |
parent | ef08a1179a707f4d93616403c2c6e0d143f71351 (diff) | |
download | android-nn-driver-d6539c58519962acd8967e93ceb2da049631c832.tar.gz |
IVGCVSW-2911 Add Android Q support to android-nn-driver infrastructure
* Updated Android.mk to build Android Q
* Added androidnn.go to inject cpp flags for Q
* Create Runtime when ACL is not enabled
Change-Id: Ia3e7a8e484fc81ce63998a65e29753cbf941173c
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to 'Android.bp')
-rw-r--r-- | Android.bp | 49 |
1 files changed, 39 insertions, 10 deletions
@@ -3,6 +3,40 @@ // SPDX-License-Identifier: MIT // +bootstrap_go_package { + name: "armnn_nn_driver", + pkgPath: "android-nn-driver", + deps: [ + "blueprint", + "blueprint-pathtools", + "blueprint-proptools", + "soong", + "soong-android", + "soong-cc", + ], + srcs: [ + "androidnn.go", + ], + pluginFor: [ "soong_build" ], +} + +armnn_nn_driver_defaults { + name: "armnn-nn-driver-default-cppflags", + cppflags: [ + "-std=c++14", + "-fexceptions", + "-DBOOST_NO_AUTO_PTR", + "-DEMBEDDED_KERNELS", + "-DARM_COMPUTE_ASSERTS_ENABLED", + "-DARM_COMPUTE_CPP_SCHEDULER", + "-Wno-unused-parameter", + "-DNO_DOT_IN_TOOLCHAIN", + + "-no-integrated-as" + ], + rtti: true, +} + //////////////////////////////////////////// // // // Arm Compute // @@ -10,6 +44,7 @@ //////////////////////////////////////////// cc_library_static { name: "armnn-arm_compute", + defaults: ["armnn-nn-driver-default-cppflags"], proprietary: true, local_include_dirs: ["clframework/build/android-arm64v8a/src/core", "clframework/build/android-arm64v8a/src/core/CL", @@ -698,16 +733,6 @@ cc_library_static { ], }, }, - cppflags: [ - "-std=c++14", - "-fexceptions", - "-DEMBEDDED_KERNELS", - "-DARM_COMPUTE_ASSERTS_ENABLED", - "-DARM_COMPUTE_CPP_SCHEDULER", - "-Wno-unused-parameter", - "-DNO_DOT_IN_TOOLCHAIN", - "-no-integrated-as" - ], rtti: true, } @@ -724,6 +749,10 @@ cc_defaults { "-O3", "-fexceptions", "-Wno-unused-parameter", + "-DBOOST_NO_AUTO_PTR" + ], + cppflags: [ + "-std=c++14" ], rtti: true, } |