From b90ab633d46ab07a5c8a7c9e162e6f540eb9a5d9 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
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 <Colm.Donelan@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I7df7d815e658a52acf3e32305bc300dfaf9a1fe4
---
 Android.bp      | 48 ------------------------------------------------
 setup.sh        | 18 ------------------
 test/Android.mk | 16 ----------------
 3 files changed, 82 deletions(-)

diff --git a/Android.bp b/Android.bp
index fde01e83..b8826cbc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,54 +3,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-////////////////////////////////////////////
-//                                        //
-//           static boost libs            //
-//                                        //
-////////////////////////////////////////////
-cc_defaults {
-    name: "libboost-defaults",
-    proprietary: true,
-    export_include_dirs: ["boost_1_64_0"],
-    cflags: [
-        "-O3",
-        "-fexceptions",
-        "-Wno-unused-parameter",
-        "-DBOOST_NO_AUTO_PTR"
-    ],
-    cppflags: [
-        "-std=c++14"
-    ],
-    rtti: true,
-}
-
-cc_library_static {
-    name: "libboost_unit_test_framework",
-    defaults: ["libboost-defaults"],
-    srcs: [
-        "boost_1_64_0/libs/test/src/compiler_log_formatter.cpp",
-        "boost_1_64_0/libs/test/src/framework.cpp",
-        "boost_1_64_0/libs/test/src/results_reporter.cpp",
-        "boost_1_64_0/libs/test/src/unit_test_main.cpp",
-        "boost_1_64_0/libs/test/src/cpp_main.cpp",
-        "boost_1_64_0/libs/test/src/junit_log_formatter.cpp",
-        "boost_1_64_0/libs/test/src/test_main.cpp",
-        "boost_1_64_0/libs/test/src/unit_test_monitor.cpp",
-        "boost_1_64_0/libs/test/src/debug.cpp",
-        "boost_1_64_0/libs/test/src/plain_report_formatter.cpp",
-        "boost_1_64_0/libs/test/src/test_tools.cpp",
-        "boost_1_64_0/libs/test/src/unit_test_parameters.cpp",
-        "boost_1_64_0/libs/test/src/decorator.cpp",
-        "boost_1_64_0/libs/test/src/progress_monitor.cpp",
-        "boost_1_64_0/libs/test/src/test_tree.cpp",
-        "boost_1_64_0/libs/test/src/xml_log_formatter.cpp",
-        "boost_1_64_0/libs/test/src/execution_monitor.cpp",
-        "boost_1_64_0/libs/test/src/results_collector.cpp",
-        "boost_1_64_0/libs/test/src/unit_test_log.cpp",
-        "boost_1_64_0/libs/test/src/xml_report_formatter.cpp",
-    ],
-}
-
 ////////////////////////////////////////////
 //                                        //
 //           flatbuffers libs             //
diff --git a/setup.sh b/setup.sh
index d1d62c9c..bf444cad 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,24 +9,6 @@ function AssertZeroExitCode {
   fi
 }
 
-if [ ! -d boost_1_64_0 ]; then
-  echo "++ Downloading Boost"
-
-  BOOST_PKG=boost_1_64_0.tar.gz
-
-  # There is a problem with downloading boost from the external. Issue can be found here:https://github.com/boostorg/boost/issues/299.
-  # Using a mirror link to download boost.
-  curl -LOk https://boostorg.jfrog.io/artifactory/main/release/1.64.0/source/boost_1_64_0.tar.gz
-  # curl -LOk https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.gz # had switched to this mirror as we were not able to download boost from boostorg.
-  AssertZeroExitCode "Downloading Boost failed"
-
-  tar xzf $BOOST_PKG
-  AssertZeroExitCode "Unpacking Boost failed"
-
-  rm -rf $BOOST_PKG
-fi
-
-
 if [ ! -d v1.12.0 ]; then
   echo "++ Downloading FlatBuffers"
 
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