From 0cc617827aade1a771f2099a8b186d0a690bda41 Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Tue, 6 Oct 2020 21:02:21 +0100 Subject: 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 Change-Id: I54c080e3b01f128c05d73ed5b7b76e5e64bd63ac --- Android.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 673bf325..ce3582fc 100644 --- a/Android.mk +++ b/Android.mk @@ -51,6 +51,7 @@ endif 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 @@ LOCAL_C_INCLUDES := \ $(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 @@ LOCAL_C_INCLUDES := \ $(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 @@ LOCAL_C_INCLUDES := \ $(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 @@ LOCAL_C_INCLUDES := \ $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_UTILS_HEADER_PATH) \ + $(ARMNN_THIRD_PARTY_PATH) \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) -- cgit v1.2.1