commit 0cc617827aade1a771f2099a8b186d0a690bda41
author Colm Donelan <Colm.Donelan@arm.com> Tue Oct 06 21:02:21 2020 +0100
committer Colm Donelan <Colm.Donelan@arm.com> Wed Oct 07 12:26:46 2020 +0100
tree 90e96db64791ced93c1938045be1d8d805a88bd3
parent 08d9a1c4c9cbea4e743feefdd310ff038a6c4588

IVGCVSW-5278 Switch Android-nn-driver/DriverOptions.cpp over to cxxopts

* Add armnn/third-party to LOCAL_C_INCLUDES in Android.mk.
* Update DriverOptions.cpp to use cxxopts instead of Boost:program_options

Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I54c080e3b01f128c05d73ed5b7b76e5e64bd63ac

Android.mk

diff --git a/Android.mk b/Android.mk
index 673bf32..ce3582f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/armnn/include
 ARMNN_THIRD_PARTY_PATH := $(LOCAL_PATH)/armnn/third-party
 ARMNN_UTILS_HEADER_PATH := $(LOCAL_PATH)/armnn/src/armnnUtils
+ARMNN_THIRD_PARTY_PATH := $(LOCAL_PATH)/armnn/third-party
 OPENCL_HEADER_PATH := $(LOCAL_PATH)/clframework/include
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../frameworks/ml/nn/runtime/include
 
@@ -107,6 +108,7 @@
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_THIRD_PARTY_PATH) \
         $(ARMNN_UTILS_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH)
 
@@ -240,6 +242,7 @@
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_THIRD_PARTY_PATH) \
         $(ARMNN_UTILS_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH)
 
@@ -366,6 +369,7 @@
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_THIRD_PARTY_PATH) \
         $(ARMNN_UTILS_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH)
 
@@ -487,6 +491,7 @@
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_THIRD_PARTY_PATH) \
         $(ARMNN_UTILS_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH)