From d6539c58519962acd8967e93ceb2da049631c832 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 22 May 2019 18:00:30 +0100
Subject: 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>
---
 Android.bp | 49 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 10 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index f6ccb099..4a997929 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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,
 }
-- 
cgit v1.2.1