From 326a000ad12f71fbcdb33f32815d24df063619aa Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 26 Jun 2019 09:41:54 +0100
Subject: IVGCVSW-3310 Update scripts to download q-fsk version

 * Updated test/Android.mk file to be consistent with Android.mk
 * Updated version number in androidnn.go to match with q-fsk

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I847f073d92457d59735b8f9ab14c7404cf5f9515
---
 androidnn.go    |  2 +-
 test/Android.mk | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/androidnn.go b/androidnn.go
index aa83b1aa..92b7b2aa 100644
--- a/androidnn.go
+++ b/androidnn.go
@@ -13,7 +13,7 @@ import (
 func globalFlags(ctx android.BaseContext) []string {
     var cppflags []string
 
-    if ctx.AConfig().PlatformVersionName() == "Q"  {
+    if ctx.AConfig().PlatformVersionName() == "Q" || ctx.AConfig().PlatformVersionName() == "10" {
         cppflags = append(cppflags, "-fno-addrsig")
     }
 
diff --git a/test/Android.mk b/test/Android.mk
index 0ba319b7..a1725996 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -18,7 +18,7 @@ ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/..
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-driver-tests@1.0
-ifeq ($(PLATFORM_VERSION),Q)
+ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
 else
@@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -49,6 +49,11 @@ LOCAL_CFLAGS+= \
         -DARMNN_ANDROID_P
 endif # PLATFORM_VERSION == 9
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.0/FullyConnectedReshape.cpp \
@@ -118,7 +123,7 @@ ifeq ($(P_OR_LATER),1)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-driver-tests@1.1
-ifeq ($(PLATFORM_VERSION),Q)
+ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
 else
@@ -137,7 +142,7 @@ LOCAL_C_INCLUDES := \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -145,6 +150,11 @@ LOCAL_CFLAGS := \
         -DARMNN_ANDROID_P \
         -DARMNN_ANDROID_NN_V1_1
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.1/Convolution2D.cpp \
@@ -227,7 +237,7 @@ LOCAL_C_INCLUDES := \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -235,6 +245,11 @@ LOCAL_CFLAGS := \
         -DARMNN_ANDROID_Q \
         -DARMNN_ANDROID_NN_V1_2
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.1/Convolution2D.cpp \
-- 
cgit v1.2.1