Update ACL pin to b84f9d34dbb857ad6113c0c89ad109498fa75fe5

[platform/upstream/armnn.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 6723deb..f767b20 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,9 @@ OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
 ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling
+ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include
+ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder
+ARMNN_THIRD_PARTY_INCLUDE_PATH := $(LOCAL_PATH)/third-party
 ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src
 ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
 ARMNN_SOURCE_UTILS_HEADER_PATH := $(LOCAL_PATH)/src/armnnUtils
@@ -66,6 +69,9 @@ LOCAL_EXPORT_C_INCLUDES := \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
         $(ARMNN_PROFILING_HEADER_PATH) \
         $(ARMNN_BACKENDS_HEADER_PATH)
@@ -75,6 +81,9 @@ LOCAL_C_INCLUDES := \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
@@ -83,6 +92,16 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_SOURCES) \
+        profiling/common/src/CommandHandlerFunctor.cpp \
+        profiling/common/src/CommandHandlerKey.cpp \
+        profiling/common/src/CommandHandlerRegistry.cpp \
+        profiling/common/src/CommonProfilingUtils.cpp \
+        profiling/common/src/NetworkSockets.cpp \
+        profiling/common/src/PacketVersionResolver.cpp \
+        profiling/common/src/SwTrace.cpp \
+        profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
+        profiling/server/src/timelineDecoder/TimelineDecoder.cpp \
+        profiling/server/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.cpp \
         src/armnn/BackendHelper.cpp \
         src/armnn/BackendRegistry.cpp \
         src/armnn/Descriptors.cpp \
@@ -119,9 +138,9 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/Permute.cpp \
         src/armnnUtils/TensorUtils.cpp \
         src/armnnUtils/VerificationHelpers.cpp \
-        src/armnnUtils/NetworkSockets.cpp \
         src/armnnUtils/Filesystem.cpp \
         src/armnnUtils/Processes.cpp \
+        src/armnnUtils/Threads.cpp \
         src/armnnUtils/Transpose.cpp \
         src/armnn/layers/ActivationLayer.cpp \
         src/armnn/layers/AdditionLayer.cpp \
@@ -145,6 +164,7 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/ElementwiseBaseLayer.cpp \
         src/armnn/layers/ElementwiseUnaryLayer.cpp \
         src/armnn/layers/FakeQuantizationLayer.cpp \
+        src/armnn/layers/FillLayer.cpp \
         src/armnn/layers/FloorLayer.cpp \
         src/armnn/layers/FullyConnectedLayer.cpp \
         src/armnn/layers/GatherLayer.cpp \
@@ -170,6 +190,7 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/QLstmLayer.cpp \
         src/armnn/layers/QuantizeLayer.cpp \
         src/armnn/layers/QuantizedLstmLayer.cpp \
+        src/armnn/layers/RankLayer.cpp \
         src/armnn/layers/ReshapeLayer.cpp \
         src/armnn/layers/ResizeLayer.cpp \
         src/armnn/layers/SliceLayer.cpp \
@@ -187,19 +208,15 @@ LOCAL_SRC_FILES := \
         src/profiling/ActivateTimelineReportingCommandHandler.cpp \
         src/profiling/BufferManager.cpp \
         src/profiling/CommandHandler.cpp \
-        src/profiling/CommandHandlerFunctor.cpp \
-        src/profiling/CommandHandlerKey.cpp \
-        src/profiling/CommandHandlerRegistry.cpp \
         src/profiling/ConnectionAcknowledgedCommandHandler.cpp \
         src/profiling/CounterDirectory.cpp \
         src/profiling/CounterIdMap.cpp \
-        src/profiling/DirectoryCaptureCommandHandler.cpp \
         src/profiling/DeactivateTimelineReportingCommandHandler.cpp \
+        src/profiling/DirectoryCaptureCommandHandler.cpp \
         src/profiling/FileOnlyProfilingConnection.cpp \
         src/profiling/Holder.cpp \
         src/profiling/LabelsAndEventClasses.cpp \
         src/profiling/PacketBuffer.cpp \
-        src/profiling/PacketVersionResolver.cpp \
         src/profiling/PeriodicCounterCapture.cpp \
         src/profiling/PeriodicCounterSelectionCommandHandler.cpp \
         src/profiling/PerJobCounterSelectionCommandHandler.cpp \
@@ -232,7 +249,8 @@ LOCAL_CFLAGS := \
         -std=$(CPP_VERSION) \
         -fexceptions \
         -Wno-unused-parameter \
-        -frtti
+        -frtti \
+        -DFMT_HEADER_ONLY
 
 # The variable to enable/disable the CL backend (ARMNN_COMPUTE_CL_ENABLED) is declared in android-nn-driver/Android.mk
 ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
@@ -299,6 +317,9 @@ LOCAL_C_INCLUDES := \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
@@ -384,12 +405,15 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/test/TensorUtilsTest.cpp \
         src/profiling/test/BufferTests.cpp \
         src/profiling/test/FileOnlyProfilingDecoratorTests.cpp \
+        src/profiling/test/PrintPacketHeaderHandler.cpp \
         src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp \
         src/profiling/test/ProfilingGuidTest.cpp \
         src/profiling/test/ProfilingTests.cpp \
         src/profiling/test/ProfilingTestUtils.cpp \
         src/profiling/test/SendCounterPacketTests.cpp \
         src/profiling/test/SendTimelinePacketTests.cpp \
+        src/profiling/test/TestTimelinePacketHandler.cpp \
+        src/profiling/test/TimelineModel.cpp \
         src/profiling/test/TimelinePacketTests.cpp \
         src/profiling/test/TimelineUtilityMethodsTests.cpp
 
@@ -421,7 +445,7 @@ LOCAL_SHARED_LIBRARIES := \
         android.hidl.allocator@1.0 \
         android.hidl.memory@1.0
 
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
+ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
 LOCAL_SHARED_LIBRARIES += \
         libOpenCL
 endif