From b90ab633d46ab07a5c8a7c9e162e6f540eb9a5d9 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Thu, 15 Jul 2021 09:46:08 +0100 Subject: IVGCVSW-5965: Remove the boost library from android-nn-driver build files. * Remove all references to boost from the android-nn-driver build files: !armnn:5811 Signed-off-by: Colm Donelan Signed-off-by: Sadik Armagan Change-Id: I7df7d815e658a52acf3e32305bc300dfaf9a1fe4 --- test/Android.mk | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'test/Android.mk') diff --git a/test/Android.mk b/test/Android.mk index 5f84a62f..f185c61e 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -63,11 +63,6 @@ LOCAL_CFLAGS+= \ -DARMNN_ANDROID_S endif # S or later -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 \ @@ -84,7 +79,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := \ libneuralnetworks_common \ - libboost_unit_test_framework \ libflatbuffers-framework \ arm_compute_library @@ -181,11 +175,6 @@ LOCAL_CFLAGS+= \ -DARMNN_ANDROID_S endif # S or later -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 \ @@ -205,7 +194,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := \ libneuralnetworks_common \ - libboost_unit_test_framework \ libflatbuffers-framework \ arm_compute_library @@ -281,7 +269,6 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DBOOST_NO_AUTO_PTR \ -DARMNN_ANDROID_NN_V1_2 # Required to build with the changes made to the Android ML framework specific to Android R @@ -317,7 +304,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := \ libneuralnetworks_common \ - libboost_unit_test_framework \ libflatbuffers-framework \ arm_compute_library @@ -389,7 +375,6 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DBOOST_NO_AUTO_PTR \ -DARMNN_ANDROID_NN_V1_3 ifeq ($(ANDROID_R),1) @@ -426,7 +411,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := \ libneuralnetworks_common \ - libboost_unit_test_framework \ libflatbuffers-framework \ arm_compute_library -- cgit v1.2.1