[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: f3a842e1ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/armnn/+/24080792

Change-Id: Id6f5782417acdf44a8ef6f74b4c242a373af2f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I6d3cb650df6fa98760af8f7f93933857d42e04e2
Merged-In: I1c086a9f4f38834495ea6392a526cd44f7d0643b
Merged-In: I26e69faa592a626c2b760a18a6a7effb573ffedc

1 files changed, 0 insertions, 566 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 31a454630..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,566 +0,0 @@
-#
-# Copyright © 2017-2023 ARM Ltd and Contributors. All rights reserved.
-# SPDX-License-Identifier: MIT
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ARMNN_ANDROID_MK_ENABLED := 1
-
-ifeq ($(ARMNN_ANDROID_MK_ENABLE),0)
-ARMNN_ANDROID_MK_ENABLED := 0
-endif
-
-ifeq ($(ARMNN_ANDROID_MK_ENABLED),1)
-
-# Configure these paths if you move the source or Khronos headers
-ARMNN_GENERATED_HEADER_PATH := $(LOCAL_PATH)/generated
-OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include
-ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
-ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling
-ARMNN_PROFILING_CLIENT_INCLUDE_PATH := $(LOCAL_PATH)/profiling/client/include
-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
-ARMNN_TEST_UTILS_SOURCE_PATH := $(LOCAL_PATH)/src/armnnTestUtils
-ARMNN_BACKENDS_HEADER_PATH := $(LOCAL_PATH)/src/backends
-ARMNN_PROFILING_HEADER_PATH := $(LOCAL_PATH)/src/profiling
-ARMNN_SERIALIZER_HEADER_PATH := $(LOCAL_PATH)/src/armnnSerializer
-ARMNN_DESERIALIZER_HEADER_PATH := $(LOCAL_PATH)/src/armnnDeserializer
-
-# find the common.mk and backend.mk files in the backend source folders
-ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/common.mk)
-ARMNN_BACKEND_COMMON_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS))
-ARMNN_BACKEND_COMMON_MAKEFILE_DIRS := $(subst /common.mk,,$(ARMNN_BACKEND_COMMON_MAKEFILE_PATHS))
-
-ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/backend.mk)
-ARMNN_BACKEND_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS))
-ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PATHS))
-
-##############
-# libarmnn.a #
-##############
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libarmnn
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered
-LOCAL_LICENSE_CONDITIONS := notice unencumbered
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
-Q_OR_LATER := 1
-CPP_VERSION := c++17
-ifeq ($(Q_OR_LATER),1)
-# "eng" is deprecated in Android Q
-LOCAL_MODULE_TAGS := optional
-else
-LOCAL_MODULE_TAGS := eng optional
-endif
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-
-# Placeholder to hold all backend source files and include paths, common and specific to the backends
-ARMNN_BACKEND_SOURCES :=
-ARMNN_BACKEND_INCLUDES :=
-
-#
-# Iterate through the backend common and specific include paths, include them into the
-# current makefile and append the sources held by the COMMON_SOURCES and BACKEND_SOURCES variable
-# (included from the given makefile) to the ARMNN_BACKEND_SOURCES list
-# and optional include paths set by BACKEND_INCLUDES to the ARMNN_BACKEND_INCLUDES list
-#
-$(foreach mkPath,$(ARMNN_BACKEND_COMMON_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/common.mk)\
-        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES)\
-        $(patsubst %,$(mkPath)/%,$(COMMON_SOURCES))))
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES)\
-        $(patsubst %,$(mkPath)/%,$(BACKEND_SOURCES))))
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_INCLUDES += $(BACKEND_INCLUDES)))
-
-# Mark source files as dependent on Android.mk and backend makefiles
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \
-                                 $(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS)
-
-LOCAL_EXPORT_C_INCLUDES := \
-        $(ARMNN_PROFILING_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
-        $(ARMNN_MAIN_HEADER_PATH) \
-        $(ARMNN_SOURCE_HEADER_PATH) \
-        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
-        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
-        $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
-        $(ARMNN_PROFILING_HEADER_PATH) \
-        $(ARMNN_BACKENDS_HEADER_PATH) \
-        $(ARMNN_SERIALIZER_HEADER_PATH) \
-        $(ARMNN_DESERIALIZER_HEADER_PATH)
-
-LOCAL_C_INCLUDES := \
-        $(OPENCL_HEADER_PATH) \
-        $(NN_HEADER_PATH) \
-        $(ARMNN_GENERATED_HEADER_PATH) \
-        $(ARMNN_PROFILING_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
-        $(ARMNN_HEADER_PATH) \
-        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
-        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
-        $(ARMNN_MAIN_HEADER_PATH) \
-        $(ARMNN_SOURCE_HEADER_PATH) \
-        $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
-        $(ARMNN_PROFILING_HEADER_PATH) \
-        $(ARMNN_BACKENDS_HEADER_PATH) \
-        $(ARMNN_SERIALIZER_HEADER_PATH) \
-        $(ARMNN_DESERIALIZER_HEADER_PATH) \
-        $(ARMNN_BACKEND_INCLUDES) \
-		$(LOCAL_PATH)/../ComputeLibrary
-
-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/CounterDirectory.cpp \
-        profiling/common/src/LabelsAndEventClasses.cpp \
-        profiling/common/src/Logging.cpp \
-        profiling/common/src/NetworkSockets.cpp \
-        profiling/common/src/PacketVersionResolver.cpp \
-        profiling/common/src/Processes.cpp \
-        profiling/common/src/SwTrace.cpp \
-        profiling/common/src/Threads.cpp \
-        profiling/client/src/ActivateTimelineReportingCommandHandler.cpp \
-        profiling/client/src/BufferManager.cpp \
-        profiling/client/src/CommandHandler.cpp \
-        profiling/client/src/ConnectionAcknowledgedCommandHandler.cpp \
-        profiling/client/src/CounterIdMap.cpp \
-        profiling/client/src/DeactivateTimelineReportingCommandHandler.cpp \
-        profiling/client/src/FileOnlyProfilingConnection.cpp \
-        profiling/client/src/Holder.cpp \
-        profiling/client/src/IProfilingService.cpp \
-        profiling/client/src/PacketBuffer.cpp \
-        profiling/client/src/PeriodicCounterCapture.cpp \
-        profiling/client/src/PeriodicCounterSelectionCommandHandler.cpp \
-        profiling/client/src/PerJobCounterSelectionCommandHandler.cpp \
-        profiling/client/src/ProfilingConnectionDumpToFileDecorator.cpp \
-        profiling/client/src/ProfilingConnectionFactory.cpp \
-        profiling/client/src/ProfilingService.cpp \
-        profiling/client/src/ProfilingStateMachine.cpp \
-        profiling/client/src/ProfilingUtils.cpp \
-        profiling/client/src/RegisterBackendCounters.cpp \
-        profiling/client/src/RequestCounterDirectoryCommandHandler.cpp \
-        profiling/client/src/SendCounterPacket.cpp \
-        profiling/client/src/SendThread.cpp \
-        profiling/client/src/SendTimelinePacket.cpp \
-        profiling/client/src/SocketProfilingConnection.cpp \
-        profiling/client/src/TimelinePacketWriterFactory.cpp \
-        profiling/client/src/TimelineUtilityMethods.cpp \
-        profiling/client/src/backends/BackendProfiling.cpp \
-        profiling/client/src/backends/IBackendProfiling.cpp \
-        profiling/server/src/timelineDecoder/DirectoryCaptureCommandHandler.cpp \
-        profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
-        profiling/server/src/timelineDecoder/TimelineDecoder.cpp \
-        profiling/server/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.cpp \
-        src/armnn/ArmNNProfilingServiceInitialiser.cpp \
-        src/armnn/BackendHelper.cpp \
-        src/armnn/BackendRegistry.cpp \
-        src/armnn/Descriptors.cpp \
-        src/armnn/Exceptions.cpp \
-        src/armnn/Graph.cpp \
-        src/armnn/ILayerSupport.cpp \
-        src/armnn/InternalTypes.cpp \
-        src/armnn/JsonPrinter.cpp \
-        src/armnn/Layer.cpp \
-        src/armnn/LoadedNetwork.cpp \
-        src/armnn/Logging.cpp \
-        src/armnn/Network.cpp \
-        src/armnn/NetworkUtils.cpp \
-        src/armnn/Observable.cpp \
-        src/armnn/Optimizer.cpp \
-        src/armnn/OutputHandler.cpp \
-        src/armnn/ProfilingEvent.cpp \
-        src/armnn/Profiling.cpp \
-        src/armnn/Runtime.cpp \
-        src/armnn/SerializeLayerParameters.cpp \
-        src/armnn/SubgraphView.cpp \
-        src/armnn/SubgraphViewSelector.cpp \
-        src/armnn/Tensor.cpp \
-        src/armnn/Threadpool.cpp \
-        src/armnn/TypesUtils.cpp \
-        src/armnn/Utils.cpp \
-        src/armnn/WallClockTimer.cpp \
-        src/armnn/WorkingMemHandle.cpp \
-        src/armnnUtils/CompatibleTypes.cpp \
-        src/armnnUtils/DataLayoutIndexed.cpp \
-        src/armnnUtils/DotSerializer.cpp \
-        src/armnnUtils/FloatingPointConverter.cpp \
-        src/armnnUtils/HeapProfiling.cpp \
-        src/armnnUtils/LeakChecking.cpp \
-        src/armnnUtils/ParserHelper.cpp \
-        src/armnnUtils/Permute.cpp \
-        src/armnnUtils/TensorUtils.cpp \
-        src/armnnUtils/VerificationHelpers.cpp \
-        src/armnnUtils/Filesystem.cpp \
-        src/armnnUtils/ProfilingOptionsConverter.cpp \
-        src/armnnUtils/Transpose.cpp \
-        src/armnn/layers/ActivationLayer.cpp \
-        src/armnn/layers/AdditionLayer.cpp \
-        src/armnn/layers/ArgMinMaxLayer.cpp \
-        src/armnn/layers/BatchMatMulLayer.cpp \
-        src/armnn/layers/BatchNormalizationLayer.cpp \
-        src/armnn/layers/BatchToSpaceNdLayer.cpp \
-        src/armnn/layers/CastLayer.cpp \
-        src/armnn/layers/ChannelShuffleLayer.cpp \
-        src/armnn/layers/ComparisonLayer.cpp \
-        src/armnn/layers/ConcatLayer.cpp \
-        src/armnn/layers/ConstantLayer.cpp \
-        src/armnn/layers/Convolution2dLayer.cpp \
-        src/armnn/layers/Convolution3dLayer.cpp \
-        src/armnn/layers/ConvertFp16ToFp32Layer.cpp \
-        src/armnn/layers/ConvertFp32ToFp16Layer.cpp \
-        src/armnn/layers/DebugLayer.cpp \
-        src/armnn/layers/DepthToSpaceLayer.cpp \
-        src/armnn/layers/DepthwiseConvolution2dLayer.cpp \
-        src/armnn/layers/DequantizeLayer.cpp \
-        src/armnn/layers/DetectionPostProcessLayer.cpp \
-        src/armnn/layers/DivisionLayer.cpp \
-        src/armnn/layers/ElementwiseBaseLayer.cpp \
-        src/armnn/layers/ElementwiseBinaryLayer.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 \
-        src/armnn/layers/GatherNdLayer.cpp \
-        src/armnn/layers/InputLayer.cpp \
-        src/armnn/layers/InstanceNormalizationLayer.cpp \
-        src/armnn/layers/L2NormalizationLayer.cpp \
-        src/armnn/layers/LogicalBinaryLayer.cpp \
-        src/armnn/layers/LogSoftmaxLayer.cpp \
-        src/armnn/layers/LstmLayer.cpp \
-        src/armnn/layers/MapLayer.cpp \
-        src/armnn/layers/MaximumLayer.cpp \
-        src/armnn/layers/MeanLayer.cpp \
-        src/armnn/layers/MemCopyLayer.cpp \
-        src/armnn/layers/MemImportLayer.cpp \
-        src/armnn/layers/MergeLayer.cpp \
-        src/armnn/layers/MinimumLayer.cpp \
-        src/armnn/layers/MultiplicationLayer.cpp \
-        src/armnn/layers/NormalizationLayer.cpp \
-        src/armnn/layers/OutputLayer.cpp \
-        src/armnn/layers/PadLayer.cpp \
-        src/armnn/layers/PermuteLayer.cpp \
-        src/armnn/layers/Pooling2dLayer.cpp \
-        src/armnn/layers/Pooling3dLayer.cpp \
-        src/armnn/layers/PreCompiledLayer.cpp \
-        src/armnn/layers/PreluLayer.cpp \
-        src/armnn/layers/QLstmLayer.cpp \
-        src/armnn/layers/QuantizeLayer.cpp \
-        src/armnn/layers/QuantizedLstmLayer.cpp \
-        src/armnn/layers/RankLayer.cpp \
-        src/armnn/layers/ReduceLayer.cpp \
-        src/armnn/layers/ReshapeLayer.cpp \
-        src/armnn/layers/ResizeLayer.cpp \
-        src/armnn/layers/ShapeLayer.cpp \
-        src/armnn/layers/SliceLayer.cpp \
-        src/armnn/layers/SoftmaxLayer.cpp \
-        src/armnn/layers/SpaceToBatchNdLayer.cpp \
-        src/armnn/layers/SpaceToDepthLayer.cpp \
-        src/armnn/layers/SplitterLayer.cpp \
-        src/armnn/layers/StackLayer.cpp \
-        src/armnn/layers/StandInLayer.cpp \
-        src/armnn/layers/StridedSliceLayer.cpp \
-        src/armnn/layers/SubtractionLayer.cpp \
-        src/armnn/layers/SwitchLayer.cpp \
-        src/armnn/layers/TransposeConvolution2dLayer.cpp \
-        src/armnn/layers/TransposeLayer.cpp \
-        src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp \
-        src/armnn/layers/UnmapLayer.cpp \
-        src/armnnSerializer/Serializer.cpp \
-        src/armnnSerializer/SerializerUtils.cpp \
-        src/armnnDeserializer/Deserializer.cpp
-
-LOCAL_STATIC_LIBRARIES := libflatbuffers-cpp
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_STATIC_LIBRARIES += arm_compute_library
-endif
-ifeq ($(TARGET_ARCH),arm64)
-LOCAL_STATIC_LIBRARIES += arm_compute_library
-endif
-
-LOCAL_SHARED_LIBRARIES := \
-        liblog
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Wno-unused-parameter \
-        -frtti \
-        -DFMT_HEADER_ONLY \
-        -Wno-ignored-qualifiers \
-        -Wno-macro-redefined \
-        -Wno-unreachable-code-loop-increment
-
-LOCAL_LDFLAGS += \
-                -Wl,-Map=libarmnnMapFile.map
-
-# 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)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTECL_ENABLED
-endif # ARMNN_COMPUTE_CL_ENABLED == 1
-# The variable to enable/disable the NEON backend (ARMNN_COMPUTE_NEON_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTENEON_ENABLED
-endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMNNREF_ENABLED
-endif # ARMNN_REF_ENABLED == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DARMNN_MIXED_PRECISION_FP16_POOLING
-endif # PLATFORM_VERSION == Q or later
-
-include $(BUILD_STATIC_LIBRARY)
-
-###############
-# armnn-tests #
-###############
-include $(CLEAR_VARS)
-
-#For in-tree android build, disable building tests as the boost dependency (only used in test)
-#is not present.
-BUILD_TESTS := 0
-ifeq ($(BUILD_TESTS),1)
-
-LOCAL_MODULE := armnn-tests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered
-LOCAL_LICENSE_CONDITIONS := notice unencumbered
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
-ifeq ($(Q_OR_LATER),1)
-# "eng" is deprecated in Android Q
-LOCAL_MODULE_TAGS := optional
-else
-LOCAL_MODULE_TAGS := eng optional
-endif
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-
-# placeholder to hold all backend unit test source files
-ARMNN_BACKEND_TEST_SOURCES :=
-ARMNN_BACKEND_TEST_INCLUDES :=
-
-#
-# iterate through the backend common and specific include paths, include them into the current
-# makefile and append the sources held by the COMMON_TEST_SOURCES and BACKEND_TEST_SOURCES
-# (included from the given makefile) to the ARMNN_BACKEND_TEST_SOURCES list
-#
-$(foreach mkPath,$(ARMNN_BACKEND_COMMON_MAKEFILE_DIRS), \
-        $(eval include $(LOCAL_PATH)/$(mkPath)/common.mk) \
-        $(eval ARMNN_BACKEND_TEST_SOURCES := $(ARMNN_BACKEND_TEST_SOURCES) \
-        $(patsubst %,$(mkPath)/%,$(COMMON_TEST_SOURCES))))
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS), \
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk) \
-        $(eval ARMNN_BACKEND_TEST_SOURCES := $(ARMNN_BACKEND_TEST_SOURCES) \
-        $(patsubst %,$(mkPath)/%,$(BACKEND_TEST_SOURCES))))
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_TEST_INCLUDES += $(BACKEND_TEST_INCLUDES)))
-
-# Placeholder to hold all backend link files.
-ARMNN_BACKEND_TEST_STATIC_LIBRARIES :=
-ARMNN_BACKEND_TEST_SHARED_LIBRARIES :=
-ifeq ($(TARGET_ARCH),arm)
-ARMNN_BACKEND_TEST_STATIC_LIBRARIES += arm_compute_library
-endif
-ifeq ($(TARGET_ARCH),arm64)
-ARMNN_BACKEND_TEST_STATIC_LIBRARIES += arm_compute_library
-endif
-
-# Iterate through the Arm NN backends and specific include paths, include them into the
-# current makefile and append the linkfiles held by
-# the optional BACKEND_STATIC_LIBRARIES and optional BACKEND_SHARED_LIBRARIES variable
-# (included from the given makefile) to
-# the ARMNN_BACKEND_STATIC_LIBRARIES and ARMNN_BACKEND_SHARED_LIBRARIES lists
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_TEST_STATIC_LIBRARIES += $(BACKEND_TEST_STATIC_LIBRARIES)))
-
-$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
-        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_TEST_SHARED_LIBRARIES += $(BACKEND_TEST_SHARED_LIBRARIES)))
-
-
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(OPENCL_HEADER_PATH) \
-        $(NN_HEADER_PATH) \
-        $(ARMNN_GENERATED_HEADER_PATH) \
-        $(ARMNN_PROFILING_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
-        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
-        $(ARMNN_HEADER_PATH) \
-        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
-        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
-        $(ARMNN_MAIN_HEADER_PATH) \
-        $(ARMNN_SOURCE_HEADER_PATH) \
-        $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
-        $(ARMNN_TEST_UTILS_SOURCE_PATH) \
-        $(ARMNN_PROFILING_HEADER_PATH) \
-        $(ARMNN_BACKENDS_HEADER_PATH) \
-        $(ARMNN_SERIALIZER_HEADER_PATH) \
-        $(ARMNN_DESERIALIZER_HEADER_PATH) \
-        $(ARMNN_BACKEND_INCLUDES) \
-		$(LOCAL_PATH)/../ComputeLibrary
-
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -frtti \
-        -Wno-unused-local-typedef \
-        -Wno-unused-variable
-
-# 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)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTECL_ENABLED
-endif # ARMNN_COMPUTE_CL_ENABLED == 1
-# The variable to enable/disable the NEON backend (ARMNN_COMPUTE_NEON_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTENEON_ENABLED
-endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMNNREF_ENABLED
-endif # ARMNN_REF_ENABLED == 1
-
-LOCAL_SRC_FILES := \
-        $(ARMNN_BACKEND_TEST_SOURCES) \
-        src/armnn/test/ConstTensorLayerVisitor.cpp \
-        src/armnn/test/EndToEndTest.cpp \
-        src/armnn/ExecutionFrame.cpp \
-        src/armnn/test/ExecutionFrameTest.cpp \
-        src/armnn/test/FloatingPointConverterTest.cpp \
-        src/armnn/test/FlowControl.cpp \
-        src/armnn/test/GraphTests.cpp \
-        src/armnn/test/InferOutputTests.cpp \
-        src/armnn/test/InstrumentTests.cpp \
-        src/armnnUtils/ModelAccuracyChecker.cpp \
-        src/armnn/test/ModelAccuracyCheckerTest.cpp \
-        src/armnn/test/NetworkTests.cpp \
-        src/armnn/test/ObservableTest.cpp \
-        src/armnn/test/optimizations/ConvertConstantsFloatToHalfTests.cpp \
-        src/armnn/test/optimizations/ConvertConstantsHalfToFloatTests.cpp \
-        src/armnn/test/optimizations/Fp32NetworkToFp16ConverterTests.cpp \
-        src/armnn/test/optimizations/FuseActivationTests.cpp \
-        src/armnn/test/optimizations/InsertDebugLayerTests.cpp \
-        src/armnn/test/optimizations/MovePermuteUpTests.cpp \
-        src/armnn/test/optimizations/OptimizeConsecutiveReshapesTests.cpp \
-        src/armnn/test/optimizations/OptimizeInverseConversionsTests.cpp \
-        src/armnn/test/optimizations/OptimizeInversePermutesTests.cpp \
-        src/armnn/test/optimizations/PermuteAndBatchToSpaceAsDepthToSpaceTests.cpp \
-        src/armnn/test/optimizations/PermuteAsReshapeTests.cpp \
-        src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp \
-        src/armnn/test/optimizations/SquashEqualSiblingsTests.cpp \
-        src/armnn/test/optimizations/TransposeAsReshapeTests.cpp \
-        src/armnn/test/OptimizerTests.cpp \
-        src/armnn/test/OptionalTest.cpp \
-        src/armnn/test/ProfilerTests.cpp \
-        src/armnn/test/ProfilingEventTest.cpp \
-        src/armnnUtils/PrototxtConversions.cpp \
-        src/armnnUtils/test/PrototxtConversionsTest.cpp \
-        src/armnn/test/SubgraphViewTests.cpp \
-        src/armnn/test/TensorHandleStrategyTest.cpp \
-        src/armnn/test/TensorTest.cpp \
-        src/armnn/test/TestInputOutputLayerVisitor.cpp \
-        src/armnn/test/TestLayerVisitor.cpp \
-        src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp \
-        src/armnn/test/TestNameOnlyLayerVisitor.cpp \
-        src/armnn/test/UtilsTests.cpp \
-        src/armnnUtils/test/ParserHelperTest.cpp \
-        src/armnnUtils/test/QuantizeHelperTest.cpp \
-        src/armnnUtils/test/TensorUtilsTest.cpp \
-        src/armnnTestUtils/CommonTestUtils.cpp \
-        src/armnnTestUtils/GraphUtils.cpp \
-        src/armnnTestUtils/MockBackend.cpp \
-        src/armnnTestUtils/MockMemoryManager.cpp \
-        src/armnnTestUtils/MockTensorHandle.cpp \
-        src/armnnTestUtils/MockTensorHandleFactory.cpp \
-        src/armnnTestUtils/TensorCopyUtils.cpp \
-        src/armnnTestUtils/TestUtils.cpp \
-        src/armnnTestUtils/UnitTests.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 \
-        src/armnnSerializer/test/ActivationSerializationTests.cpp \
-        src/armnnSerializer/test/ComparisonSerializationTests.cpp \
-        src/armnnSerializer/test/LstmSerializationTests.cpp \
-        src/armnnSerializer/test/SerializerTests.cpp \
-        src/armnnSerializer/test/SerializerTestUtils.cpp
-
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_SRC_FILES += \
-        src/armnn/test/DebugCallbackTest.cpp \
-        src/armnn/test/RuntimeTests.cpp
-endif
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libflatbuffers-cpp \
-        $(ARMNN_BACKEND_TEST_STATIC_LIBRARIES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0 \
-        $(ARMNN_BACKEND_TEST_SHARED_LIBRARIES)
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
-    LOCAL_SHARED_LIBRARIES += libOpenCL
-endif
-endif
-
-include $(BUILD_EXECUTABLE)
-endif # BUILD_TESTS
-endif # ARMNN_ENABLE