diff --git a/Android.bp b/Android.bp
index 1b8f8bc..7632c8c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,795 +20,6 @@
     pluginFor: [ "soong_build" ],
 }
 
-armnn_nn_driver_defaults {
-       name: "armnn-nn-driver-default-cppflags",
-       cppflags: [
-            "-std=c++14",
-            "-fexceptions",
-            "-DBOOST_NO_AUTO_PTR",
-            "-DEMBEDDED_KERNELS",
-            "-DARM_COMPUTE_ASSERTS_ENABLED",
-            "-DARM_COMPUTE_CPP_SCHEDULER",
-            "-Wno-unused-parameter",
-            "-DNO_DOT_IN_TOOLCHAIN",
-
-            "-no-integrated-as"
-    ],
-    rtti: true,
-}
-
-////////////////////////////////////////////
-//                                        //
-//              Arm Compute               //
-//                                        //
-////////////////////////////////////////////
-cc_library_static {
-    name: "armnn-arm_compute",
-    defaults: ["armnn-nn-driver-default-cppflags"],
-    proprietary: true,
-    local_include_dirs: ["clframework/build/android-arm64v8a/src/core",
-                         "clframework/build/android-arm64v8a/src/core/CL",
-                         "clframework/arm_compute/core/NEON/kernels/assembly",
-                         "clframework/arm_compute/core/NEON/kernels/convolution/common",
-                         "clframework/arm_compute/core/NEON/kernels/convolution/depthwise",
-                         "clframework/arm_compute/core/NEON/kernels/convolution/winograd"],
-    export_include_dirs: ["clframework", "clframework/include"],
-    srcs: [
-        "clframework/src/core/AccessWindowAutoPadding.cpp",
-        "clframework/src/core/AccessWindowStatic.cpp",
-        "clframework/src/core/AccessWindowTranspose.cpp",
-        "clframework/src/core/CL/CLCoreRuntimeContext.cpp",
-        "clframework/src/core/CL/CLHelpers.cpp",
-        "clframework/src/core/CL/CLKernelLibrary.cpp",
-        "clframework/src/core/CL/gemm/CLGEMMHelpers.cpp",
-        "clframework/src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.cpp",
-        "clframework/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.cpp",
-        "clframework/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp",
-        "clframework/src/core/CL/ICLDistribution1D.cpp",
-        "clframework/src/core/CL/ICLHOG.cpp",
-        "clframework/src/core/CL/ICLKernel.cpp",
-        "clframework/src/core/CL/ICLLut.cpp",
-        "clframework/src/core/CL/ICLMultiHOG.cpp",
-        "clframework/src/core/CL/ICLMultiImage.cpp",
-        "clframework/src/core/CL/ICLSimple2DKernel.cpp",
-        "clframework/src/core/CL/ICLSimple3DKernel.cpp",
-        "clframework/src/core/CL/ICLSimpleKernel.cpp",
-        "clframework/src/core/CL/ICLTensor.cpp",
-        "clframework/src/core/CL/kernels/CLAbsoluteDifferenceKernel.cpp",
-        "clframework/src/core/CL/kernels/CLAccumulateKernel.cpp",
-        "clframework/src/core/CL/kernels/CLActivationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLArgMinMaxLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBatchConcatenateLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBitwiseAndKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBitwiseNotKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBitwiseOrKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBitwiseXorKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBoundingBoxTransformKernel.cpp",
-        "clframework/src/core/CL/kernels/CLBox3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLCannyEdgeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLChannelCombineKernel.cpp",
-        "clframework/src/core/CL/kernels/CLChannelExtractKernel.cpp",
-        "clframework/src/core/CL/kernels/CLChannelShuffleLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLCol2ImKernel.cpp",
-        "clframework/src/core/CL/kernels/CLColorConvertKernel.cpp",
-        "clframework/src/core/CL/kernels/CLComparisonKernel.cpp",
-        "clframework/src/core/CL/kernels/CLConvertFullyConnectedWeightsKernel.cpp",
-        "clframework/src/core/CL/kernels/CLConvolutionKernel.cpp",
-        "clframework/src/core/CL/kernels/CLCopyKernel.cpp",
-        "clframework/src/core/CL/kernels/CLCropKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDeconvolutionReshapeOutputKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthConvertLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthToSpaceLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerNativeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDequantizationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDerivativeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDilateKernel.cpp",
-        "clframework/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLElementwiseOperationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLErodeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFastCornersKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFFTDigitReverseKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFFTRadixStageKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFFTScaleKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFillBorderKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFlattenLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFloorKernel.cpp",
-        "clframework/src/core/CL/kernels/CLFuseBatchNormalizationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGatherKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGaussian3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLGaussian5x5Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLGaussianPyramidKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyNativeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpOffsetContributionOutputStageKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToUint8ScaleByFloatKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToUint8ScaleKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMLowpReductionKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixAccumulateBiasesKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyNativeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedOnlyRHSKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMMatrixVectorMultiplyKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMReshapeLHSMatrixKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGEMMReshapeRHSMatrixKernel.cpp",
-        "clframework/src/core/CL/kernels/CLGenerateProposalsLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLHarrisCornersKernel.cpp",
-        "clframework/src/core/CL/kernels/CLHeightConcatenateLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLHistogramKernel.cpp",
-        "clframework/src/core/CL/kernels/CLHOGDescriptorKernel.cpp",
-        "clframework/src/core/CL/kernels/CLHOGDetectorKernel.cpp",
-        "clframework/src/core/CL/kernels/CLIm2ColKernel.cpp",
-        "clframework/src/core/CL/kernels/CLInstanceNormalizationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLIntegralImageKernel.cpp",
-        "clframework/src/core/CL/kernels/CLL2NormalizeLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLLKTrackerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMeanStdDevKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMeanStdDevNormalizationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMedian3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLMemsetKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMinMaxLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLMinMaxLocationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLNonLinearFilterKernel.cpp",
-        "clframework/src/core/CL/kernels/CLNonMaximaSuppression3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLNormalizationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLNormalizePlanarYUVLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLPadLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLPermuteKernel.cpp",
-        "clframework/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLPoolingLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLPriorBoxLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLQuantizationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLRangeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLReductionOperationKernel.cpp",
-        "clframework/src/core/CL/kernels/CLRemapKernel.cpp",
-        "clframework/src/core/CL/kernels/CLReorgLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLReshapeLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLReverseKernel.cpp",
-        "clframework/src/core/CL/kernels/CLROIAlignLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLROIPoolingLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLScaleKernel.cpp",
-        "clframework/src/core/CL/kernels/CLScharr3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLSelectKernel.cpp",
-        "clframework/src/core/CL/kernels/CLSobel3x3Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLSobel5x5Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLSobel7x7Kernel.cpp",
-        "clframework/src/core/CL/kernels/CLSoftmaxLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLSpaceToDepthLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLStackLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLStridedSliceKernel.cpp",
-        "clframework/src/core/CL/kernels/CLTableLookupKernel.cpp",
-        "clframework/src/core/CL/kernels/CLThresholdKernel.cpp",
-        "clframework/src/core/CL/kernels/CLTileKernel.cpp",
-        "clframework/src/core/CL/kernels/CLTransposeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLUpsampleLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWarpAffineKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWarpPerspectiveKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWeightsReshapeKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWidthConcatenate2TensorsKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWidthConcatenate4TensorsKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWidthConcatenateLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWinogradFilterTransformKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWinogradInputTransformKernel.cpp",
-        "clframework/src/core/CL/kernels/CLWinogradOutputTransformKernel.cpp",
-        "clframework/src/core/CL/kernels/CLYOLOLayerKernel.cpp",
-        "clframework/src/core/CL/OpenCL.cpp",
-        "clframework/src/core/CPP/CPPTypes.cpp",
-        "clframework/src/core/CPP/ICPPSimpleKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPPermuteKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPSortEuclideanDistanceKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPTopKVKernel.cpp",
-        "clframework/src/core/CPP/kernels/CPPUpsampleKernel.cpp",
-        "clframework/src/core/Error.cpp",
-        "clframework/src/core/GPUTarget.cpp",
-        "clframework/src/core/Helpers.cpp",
-        "clframework/src/core/HOGInfo.cpp",
-        "clframework/src/core/IAccessWindow.cpp",
-        "clframework/src/core/IDistribution1D.cpp",
-        "clframework/src/core/IDistribution.cpp",
-        "clframework/src/core/IKernel.cpp",
-        "clframework/src/core/ITensor.cpp",
-        "clframework/src/core/MultiImageInfo.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_int16.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_int8.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_qint8.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_quint8.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint16.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/mergeresults.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/misc.cpp",
-        "clframework/src/core/NEON/kernels/arm_gemm/quantized.cpp",
-        "clframework/src/core/NEON/kernels/assembly/Helpers.cpp",
-        "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
-        "clframework/src/core/NEON/kernels/convolution/common/padding.cpp",
-        "clframework/src/core/NEON/kernels/convolution/common/qasymm8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/common/qsymm8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/common/utils.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_1x1_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_2x2_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_1x1_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_2x2_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_dilated.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_dilated_qa8_qa8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_fp16.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_qa8_qa8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_qs8_qs8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/padding.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_1x8_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_4x4_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_6x6_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2_7_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2x2_3x3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2x2_5x5_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_4_5_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_4x4_3x3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_6_3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2_7_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2x2_3x3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2x2_5x5_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4_5_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4x4_3x3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_6_3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/NEAbsoluteDifferenceKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEAccumulateKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEActivationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEArithmeticSubtractionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBatchConcatenateLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBatchNormalizationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBitwiseAndKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBitwiseNotKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBitwiseOrKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBitwiseXorKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBoundingBoxTransformKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEBox3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NECannyEdgeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEChannelCombineKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEChannelExtractKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEChannelShuffleLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NECol2ImKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEColorConvertKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEConvertQuantizedSignednessKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEConvolutionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NECopyKernel.cpp",
-        "clframework/src/core/NEON/kernels/NECropKernel.cpp",
-        "clframework/src/core/NEON/kernels/NECumulativeDistributionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDepthToSpaceLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDequantizationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDerivativeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDilateKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEDirectConvolutionLayerOutputStageKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEErodeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFastCornersKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFFTDigitReverseKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFFTRadixStageKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFFTScaleKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFillArrayKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFillBorderKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFlattenLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFloorKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGatherKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGaussian3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGaussian5x5Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGaussianPyramidKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMInterleave4x4Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpMatrixMultiplyKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpOffsetContributionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpQuantizeDownInt32ToInt16ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpQuantizeDownInt32ToInt8ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpQuantizeDownInt32ToUint8ScaleKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMLowpReductionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMMatrixAccumulateBiasesKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMMatrixAdditionKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGEMMTranspose1xWKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEGenerateProposalsLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEHarrisCornersKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEHeightConcatenateLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEHistogramKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEHOGDescriptorKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEHOGDetectorKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEIm2ColKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEInstanceNormalizationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEIntegralImageKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEL2NormalizeLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NELKTrackerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NELocallyConnectedMatrixMultiplyKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMagnitudePhaseKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMeanStdDevKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMeanStdDevNormalizationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMedian3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMemsetKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEMinMaxLocationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NENonLinearFilterKernel.cpp",
-        "clframework/src/core/NEON/kernels/NENonMaximaSuppression3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NENormalizationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEPadLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEPermuteKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEPoolingLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEPriorBoxLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEQuantizationLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NERangeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEReductionOperationKernel.cpp",
-        "clframework/src/core/NEON/kernels/NERemapKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEReorgLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEReshapeLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEReverseKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEROIAlignLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEScaleKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEScharr3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NESelectKernel.cpp",
-        "clframework/src/core/NEON/kernels/NESobel3x3Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NESobel5x5Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NESobel7x7Kernel.cpp",
-        "clframework/src/core/NEON/kernels/NESoftmaxLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEStackLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEStridedSliceKernel.cpp",
-        "clframework/src/core/NEON/kernels/NETableLookupKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEThresholdKernel.cpp",
-        "clframework/src/core/NEON/kernels/NETileKernel.cpp",
-        "clframework/src/core/NEON/kernels/NETransposeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEUpsampleLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEWarpKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEWeightsReshapeKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEWidthConcatenateLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp",
-        "clframework/src/core/NEON/kernels/NEYOLOLayerKernel.cpp",
-        "clframework/src/core/PyramidInfo.cpp",
-        "clframework/src/core/Rounding.cpp",
-        "clframework/src/core/SubTensorInfo.cpp",
-        "clframework/src/core/TensorInfo.cpp",
-        "clframework/src/core/Utils.cpp",
-        "clframework/src/core/utils/helpers/fft.cpp",
-        "clframework/src/core/utils/helpers/tensor_transform.cpp",
-        "clframework/src/core/utils/io/FileHandler.cpp",
-        "clframework/src/core/utils/logging/FilePrinter.cpp",
-        "clframework/src/core/utils/logging/Helpers.cpp",
-        "clframework/src/core/utils/logging/Logger.cpp",
-        "clframework/src/core/utils/logging/LoggerRegistry.cpp",
-        "clframework/src/core/utils/misc/MMappedFile.cpp",
-        "clframework/src/core/utils/quantization/AsymmHelpers.cpp",
-        "clframework/src/core/Validate.cpp",
-        "clframework/src/runtime/Allocator.cpp",
-        "clframework/src/runtime/BlobLifetimeManager.cpp",
-        "clframework/src/runtime/BlobMemoryPool.cpp",
-        "clframework/src/runtime/CL/CLBufferAllocator.cpp",
-        "clframework/src/runtime/CL/CLDistribution1D.cpp",
-        "clframework/src/runtime/CL/CLHelpers.cpp",
-        "clframework/src/runtime/CL/CLHOG.cpp",
-        "clframework/src/runtime/CL/CLLutAllocator.cpp",
-        "clframework/src/runtime/CL/CLLut.cpp",
-        "clframework/src/runtime/CL/CLMemory.cpp",
-        "clframework/src/runtime/CL/CLMemoryRegion.cpp",
-        "clframework/src/runtime/CL/CLMultiHOG.cpp",
-        "clframework/src/runtime/CL/CLMultiImage.cpp",
-        "clframework/src/runtime/CL/CLPyramid.cpp",
-        "clframework/src/runtime/CL/CLRuntimeContext.cpp",
-        "clframework/src/runtime/CL/CLScheduler.cpp",
-        "clframework/src/runtime/CL/CLSubTensor.cpp",
-        "clframework/src/runtime/CL/CLTensorAllocator.cpp",
-        "clframework/src/runtime/CL/CLTensor.cpp",
-        "clframework/src/runtime/CL/CLTuner.cpp",
-        "clframework/src/runtime/CL/functions/CLAbsoluteDifference.cpp",
-        "clframework/src/runtime/CL/functions/CLAccumulate.cpp",
-        "clframework/src/runtime/CL/functions/CLActivationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLArgMinMaxLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLBatchNormalizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLBatchToSpaceLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLBitwiseAnd.cpp",
-        "clframework/src/runtime/CL/functions/CLBitwiseNot.cpp",
-        "clframework/src/runtime/CL/functions/CLBitwiseOr.cpp",
-        "clframework/src/runtime/CL/functions/CLBitwiseXor.cpp",
-        "clframework/src/runtime/CL/functions/CLBoundingBoxTransform.cpp",
-        "clframework/src/runtime/CL/functions/CLBox3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLCannyEdge.cpp",
-        "clframework/src/runtime/CL/functions/CLCast.cpp",
-        "clframework/src/runtime/CL/functions/CLChannelCombine.cpp",
-        "clframework/src/runtime/CL/functions/CLChannelExtract.cpp",
-        "clframework/src/runtime/CL/functions/CLChannelShuffleLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLColorConvert.cpp",
-        "clframework/src/runtime/CL/functions/CLComparison.cpp",
-        "clframework/src/runtime/CL/functions/CLComputeAllAnchors.cpp",
-        "clframework/src/runtime/CL/functions/CLConcatenateLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLConvertFullyConnectedWeights.cpp",
-        "clframework/src/runtime/CL/functions/CLConvolution.cpp",
-        "clframework/src/runtime/CL/functions/CLConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLCopy.cpp",
-        "clframework/src/runtime/CL/functions/CLCropResize.cpp",
-        "clframework/src/runtime/CL/functions/CLDeconvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDeconvolutionLayerUpsample.cpp",
-        "clframework/src/runtime/CL/functions/CLDepthConvertLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDepthToSpaceLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDepthwiseConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDequantizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDerivative.cpp",
-        "clframework/src/runtime/CL/functions/CLDilate.cpp",
-        "clframework/src/runtime/CL/functions/CLDirectConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLDirectDeconvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLElementwiseOperations.cpp",
-        "clframework/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLEqualizeHistogram.cpp",
-        "clframework/src/runtime/CL/functions/CLErode.cpp",
-        "clframework/src/runtime/CL/functions/CLFastCorners.cpp",
-        "clframework/src/runtime/CL/functions/CLFFT1D.cpp",
-        "clframework/src/runtime/CL/functions/CLFFT2D.cpp",
-        "clframework/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLFillBorder.cpp",
-        "clframework/src/runtime/CL/functions/CLFill.cpp",
-        "clframework/src/runtime/CL/functions/CLFlattenLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLFloor.cpp",
-        "clframework/src/runtime/CL/functions/CLFullyConnectedLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLFuseBatchNormalization.cpp",
-        "clframework/src/runtime/CL/functions/CLGather.cpp",
-        "clframework/src/runtime/CL/functions/CLGaussian3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLGaussian5x5.cpp",
-        "clframework/src/runtime/CL/functions/CLGaussianPyramid.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMM.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMDeconvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp",
-        "clframework/src/runtime/CL/functions/CLGEMMLowpOutputStage.cpp",
-        "clframework/src/runtime/CL/functions/CLGenerateProposalsLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLHarrisCorners.cpp",
-        "clframework/src/runtime/CL/functions/CLHistogram.cpp",
-        "clframework/src/runtime/CL/functions/CLHOGDescriptor.cpp",
-        "clframework/src/runtime/CL/functions/CLHOGDetector.cpp",
-        "clframework/src/runtime/CL/functions/CLHOGGradient.cpp",
-        "clframework/src/runtime/CL/functions/CLHOGMultiDetection.cpp",
-        "clframework/src/runtime/CL/functions/CLInstanceNormalizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLIntegralImage.cpp",
-        "clframework/src/runtime/CL/functions/CLL2NormalizeLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLLaplacianPyramid.cpp",
-        "clframework/src/runtime/CL/functions/CLLaplacianReconstruct.cpp",
-        "clframework/src/runtime/CL/functions/CLLocallyConnectedLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLLSTMLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLLSTMLayerQuantized.cpp",
-        "clframework/src/runtime/CL/functions/CLMagnitude.cpp",
-        "clframework/src/runtime/CL/functions/CLMeanStdDev.cpp",
-        "clframework/src/runtime/CL/functions/CLMeanStdDevNormalizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLMedian3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLMinMaxLocation.cpp",
-        "clframework/src/runtime/CL/functions/CLNonLinearFilter.cpp",
-        "clframework/src/runtime/CL/functions/CLNonMaximaSuppression3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLNormalizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLNormalizePlanarYUVLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLOpticalFlow.cpp",
-        "clframework/src/runtime/CL/functions/CLPadLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLPermute.cpp",
-        "clframework/src/runtime/CL/functions/CLPhase.cpp",
-        "clframework/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp",
-        "clframework/src/runtime/CL/functions/CLPoolingLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLPReluLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLPriorBoxLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLQuantizationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLRange.cpp",
-        "clframework/src/runtime/CL/functions/CLReduceMean.cpp",
-        "clframework/src/runtime/CL/functions/CLReductionOperation.cpp",
-        "clframework/src/runtime/CL/functions/CLRemap.cpp",
-        "clframework/src/runtime/CL/functions/CLReorgLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLReshapeLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLReverse.cpp",
-        "clframework/src/runtime/CL/functions/CLRNNLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLROIAlignLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLROIPoolingLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLScale.cpp",
-        "clframework/src/runtime/CL/functions/CLScharr3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLSelect.cpp",
-        "clframework/src/runtime/CL/functions/CLSlice.cpp",
-        "clframework/src/runtime/CL/functions/CLSobel3x3.cpp",
-        "clframework/src/runtime/CL/functions/CLSobel5x5.cpp",
-        "clframework/src/runtime/CL/functions/CLSobel7x7.cpp",
-        "clframework/src/runtime/CL/functions/CLSoftmaxLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLSpaceToBatchLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLSpaceToDepthLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLSplit.cpp",
-        "clframework/src/runtime/CL/functions/CLStackLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLStridedSlice.cpp",
-        "clframework/src/runtime/CL/functions/CLTableLookup.cpp",
-        "clframework/src/runtime/CL/functions/CLThreshold.cpp",
-        "clframework/src/runtime/CL/functions/CLTile.cpp",
-        "clframework/src/runtime/CL/functions/CLTranspose.cpp",
-        "clframework/src/runtime/CL/functions/CLUnstack.cpp",
-        "clframework/src/runtime/CL/functions/CLUpsampleLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLWarpAffine.cpp",
-        "clframework/src/runtime/CL/functions/CLWarpPerspective.cpp",
-        "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp",
-        "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp",
-        "clframework/src/runtime/CL/ICLSimpleFunction.cpp",
-        "clframework/src/runtime/CL/tuners/BifrostTuner.cpp",
-        "clframework/src/runtime/CL/tuners/CLLWSList.cpp",
-        "clframework/src/runtime/CL/tuners/MidgardTuner.cpp",
-        "clframework/src/runtime/CPP/CPPScheduler.cpp",
-        "clframework/src/runtime/CPP/functions/CPPBoxWithNonMaximaSuppressionLimit.cpp",
-        "clframework/src/runtime/CPP/functions/CPPDetectionOutputLayer.cpp",
-        "clframework/src/runtime/CPP/functions/CPPDetectionPostProcessLayer.cpp",
-        "clframework/src/runtime/CPP/functions/CPPNonMaximumSuppression.cpp",
-        "clframework/src/runtime/CPP/functions/CPPPermute.cpp",
-        "clframework/src/runtime/CPP/functions/CPPTopKV.cpp",
-        "clframework/src/runtime/CPP/functions/CPPUpsample.cpp",
-        "clframework/src/runtime/CPP/ICPPSimpleFunction.cpp",
-        "clframework/src/runtime/CPP/SingleThreadScheduler.cpp",
-        "clframework/src/runtime/CPUUtils.cpp",
-        "clframework/src/runtime/DeviceProperties.cpp",
-        "clframework/src/runtime/Distribution1D.cpp",
-        "clframework/src/runtime/HOG.cpp",
-        "clframework/src/runtime/ILutAllocator.cpp",
-        "clframework/src/runtime/IScheduler.cpp",
-        "clframework/src/runtime/ISimpleLifetimeManager.cpp",
-        "clframework/src/runtime/ITensorAllocator.cpp",
-        "clframework/src/runtime/IWeightsManager.cpp",
-        "clframework/src/runtime/LutAllocator.cpp",
-        "clframework/src/runtime/Lut.cpp",
-        "clframework/src/runtime/Memory.cpp",
-        "clframework/src/runtime/MemoryManagerOnDemand.cpp",
-        "clframework/src/runtime/MEMUtils.cpp",
-        "clframework/src/runtime/MultiHOG.cpp",
-        "clframework/src/runtime/MultiImage.cpp",
-        "clframework/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp",
-        "clframework/src/runtime/NEON/functions/NEAbsoluteDifference.cpp",
-        "clframework/src/runtime/NEON/functions/NEAccumulate.cpp",
-        "clframework/src/runtime/NEON/functions/NEActivationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEArgMinMaxLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEArithmeticAddition.cpp",
-        "clframework/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp",
-        "clframework/src/runtime/NEON/functions/NEBatchNormalizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEBatchToSpaceLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEBitwiseAnd.cpp",
-        "clframework/src/runtime/NEON/functions/NEBitwiseNot.cpp",
-        "clframework/src/runtime/NEON/functions/NEBitwiseOr.cpp",
-        "clframework/src/runtime/NEON/functions/NEBitwiseXor.cpp",
-        "clframework/src/runtime/NEON/functions/NEBoundingBoxTransform.cpp",
-        "clframework/src/runtime/NEON/functions/NEBox3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NECannyEdge.cpp",
-        "clframework/src/runtime/NEON/functions/NECast.cpp",
-        "clframework/src/runtime/NEON/functions/NEChannelCombine.cpp",
-        "clframework/src/runtime/NEON/functions/NEChannelExtract.cpp",
-        "clframework/src/runtime/NEON/functions/NEChannelShuffleLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NECol2Im.cpp",
-        "clframework/src/runtime/NEON/functions/NEColorConvert.cpp",
-        "clframework/src/runtime/NEON/functions/NEComputeAllAnchors.cpp",
-        "clframework/src/runtime/NEON/functions/NEConcatenateLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp",
-        "clframework/src/runtime/NEON/functions/NEConvolution.cpp",
-        "clframework/src/runtime/NEON/functions/NEConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NECopy.cpp",
-        "clframework/src/runtime/NEON/functions/NECropResize.cpp",
-        "clframework/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDepthConvertLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDepthToSpaceLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDequantizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDerivative.cpp",
-        "clframework/src/runtime/NEON/functions/NEDetectionPostProcessLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEDilate.cpp",
-        "clframework/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEElementwiseOperators.cpp",
-        "clframework/src/runtime/NEON/functions/NEElementwiseUnaryLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEEqualizeHistogram.cpp",
-        "clframework/src/runtime/NEON/functions/NEErode.cpp",
-        "clframework/src/runtime/NEON/functions/NEFastCorners.cpp",
-        "clframework/src/runtime/NEON/functions/NEFFT1D.cpp",
-        "clframework/src/runtime/NEON/functions/NEFFT2D.cpp",
-        "clframework/src/runtime/NEON/functions/NEFFTConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEFillBorder.cpp",
-        "clframework/src/runtime/NEON/functions/NEFill.cpp",
-        "clframework/src/runtime/NEON/functions/NEFlattenLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEFloor.cpp",
-        "clframework/src/runtime/NEON/functions/NEFullyConnectedLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEFuseBatchNormalization.cpp",
-        "clframework/src/runtime/NEON/functions/NEGather.cpp",
-        "clframework/src/runtime/NEON/functions/NEGaussian3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NEGaussian5x5.cpp",
-        "clframework/src/runtime/NEON/functions/NEGaussianPyramid.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMM.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp",
-        "clframework/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp",
-        "clframework/src/runtime/NEON/functions/NEGenerateProposalsLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEHarrisCorners.cpp",
-        "clframework/src/runtime/NEON/functions/NEHistogram.cpp",
-        "clframework/src/runtime/NEON/functions/NEHOGDescriptor.cpp",
-        "clframework/src/runtime/NEON/functions/NEHOGDetector.cpp",
-        "clframework/src/runtime/NEON/functions/NEHOGGradient.cpp",
-        "clframework/src/runtime/NEON/functions/NEHOGMultiDetection.cpp",
-        "clframework/src/runtime/NEON/functions/NEIm2Col.cpp",
-        "clframework/src/runtime/NEON/functions/NEInstanceNormalizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEIntegralImage.cpp",
-        "clframework/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NELaplacianPyramid.cpp",
-        "clframework/src/runtime/NEON/functions/NELaplacianReconstruct.cpp",
-        "clframework/src/runtime/NEON/functions/NELocallyConnectedLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NELSTMLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NELSTMLayerQuantized.cpp",
-        "clframework/src/runtime/NEON/functions/NEMagnitude.cpp",
-        "clframework/src/runtime/NEON/functions/NEMeanStdDev.cpp",
-        "clframework/src/runtime/NEON/functions/NEMeanStdDevNormalizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEMedian3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NEMinMaxLocation.cpp",
-        "clframework/src/runtime/NEON/functions/NENonLinearFilter.cpp",
-        "clframework/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NENormalizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEOpticalFlow.cpp",
-        "clframework/src/runtime/NEON/functions/NEPadLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEPermute.cpp",
-        "clframework/src/runtime/NEON/functions/NEPhase.cpp",
-        "clframework/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp",
-        "clframework/src/runtime/NEON/functions/NEPoolingLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEPReluLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEPriorBoxLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEQuantizationLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NERange.cpp",
-        "clframework/src/runtime/NEON/functions/NEReduceMean.cpp",
-        "clframework/src/runtime/NEON/functions/NEReductionOperation.cpp",
-        "clframework/src/runtime/NEON/functions/NERemap.cpp",
-        "clframework/src/runtime/NEON/functions/NEReorgLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEReshapeLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEReverse.cpp",
-        "clframework/src/runtime/NEON/functions/NERNNLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEROIAlignLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEROIPoolingLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEScale.cpp",
-        "clframework/src/runtime/NEON/functions/NEScharr3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NESelect.cpp",
-        "clframework/src/runtime/NEON/functions/NESimpleAssemblyFunction.cpp",
-        "clframework/src/runtime/NEON/functions/NESlice.cpp",
-        "clframework/src/runtime/NEON/functions/NESobel3x3.cpp",
-        "clframework/src/runtime/NEON/functions/NESobel5x5.cpp",
-        "clframework/src/runtime/NEON/functions/NESobel7x7.cpp",
-        "clframework/src/runtime/NEON/functions/NESoftmaxLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NESpaceToBatchLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NESpaceToDepthLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NESplit.cpp",
-        "clframework/src/runtime/NEON/functions/NEStackLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEStridedSlice.cpp",
-        "clframework/src/runtime/NEON/functions/NETableLookup.cpp",
-        "clframework/src/runtime/NEON/functions/NEThreshold.cpp",
-        "clframework/src/runtime/NEON/functions/NETile.cpp",
-        "clframework/src/runtime/NEON/functions/NETranspose.cpp",
-        "clframework/src/runtime/NEON/functions/NEUnstack.cpp",
-        "clframework/src/runtime/NEON/functions/NEUpsampleLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEWarpAffine.cpp",
-        "clframework/src/runtime/NEON/functions/NEWarpPerspective.cpp",
-        "clframework/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp",
-        "clframework/src/runtime/NEON/functions/NEYOLOLayer.cpp",
-        "clframework/src/runtime/NEON/INESimpleFunction.cpp",
-        "clframework/src/runtime/NEON/INESimpleFunctionNoBorder.cpp",
-        "clframework/src/runtime/OffsetLifetimeManager.cpp",
-        "clframework/src/runtime/OffsetMemoryPool.cpp",
-        "clframework/src/runtime/OMP/OMPScheduler.cpp",
-        "clframework/src/runtime/PoolManager.cpp",
-        "clframework/src/runtime/Pyramid.cpp",
-        "clframework/src/runtime/RuntimeContext.cpp",
-        "clframework/src/runtime/Scheduler.cpp",
-        "clframework/src/runtime/SchedulerFactory.cpp",
-        "clframework/src/runtime/SubTensor.cpp",
-        "clframework/src/runtime/TensorAllocator.cpp",
-        "clframework/src/runtime/Tensor.cpp",
-        "clframework/src/runtime/Utils.cpp",
-        "clframework/utils/CommonGraphOptions.cpp",
-        "clframework/utils/GraphUtils.cpp",
-        "clframework/utils/Utils.cpp",
-    ],
-    arch: {
-        arm: {
-            srcs: [
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/a53.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/a55r1.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/generic.cpp"
-            ],
-        },
-        arm64: {
-            srcs: [
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s16_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s8_12x8/a55r1.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s8_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s8_4x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_u16_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_u8_12x8/a55r1.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_u8_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_u8_4x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_24x8/a55r1.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_24x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_16x4/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_16x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_4x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_s8s32_dot_16x4/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_s8s32_dot_16x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_dot_16x4/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_dot_16x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_s8s32_mmla_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_u8u32_mmla_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_native_fp32_mla_16x4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a53.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/a55r1.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_12x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_pretransposed/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_trans/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_4x6/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_4x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x6/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x8/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_4x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x6/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x6/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/a55.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_4x8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp16_mla_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_fp32_mla_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_s8s32_dot_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_fp16_mla_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_fp32_mla_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_s8s32_dot_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_s8s32_mmla_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_mmla_3VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_fp16_mla_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_fp32_mla_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_s8s32_dot_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_native_u8u32_dot_4VLx4/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_s8s32_dot_1VLx8/generic.cpp",
-                "clframework/src/core/NEON/kernels/arm_gemm/kernels/sve_smallK_hybrid_u8u32_dot_1VLx8/generic.cpp",
-            ],
-        },
-    },
-    rtti: true,
-}
-
 ////////////////////////////////////////////
 //                                        //
 //           static boost libs            //
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 66e651d..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,658 +0,0 @@
-#
-# Copyright © 2017 ARM Ltd. All rights reserved.
-# SPDX-License-Identifier: MIT
-#
-
-ANDROID_NN_DRIVER_LOCAL_PATH := $(call my-dir)
-LOCAL_PATH := $(ANDROID_NN_DRIVER_LOCAL_PATH)
-
-P_OR_LATER := 0
-Q_OR_LATER := 0
-
-ifeq ($(PLATFORM_VERSION),9)
-P_OR_LATER := 1
-endif # PLATFORM_VERSION == 9
-ifeq ($(PLATFORM_VERSION),P)
-P_OR_LATER := 1
-endif # PLATFORM_VERSION == P
-
-ifeq ($(PLATFORM_VERSION),10)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-endif # PLATFORM_VERSION == 10
-ifeq ($(PLATFORM_VERSION),Q)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-endif # PLATFORM_VERSION == Q
-
-CPP_VERSION := c++14
-
-ifeq ($(Q_OR_LATER),1)
-CPP_VERSION := c++17
-endif
-
-# Configure these paths if you move the source or Khronos headers
-ARMNN_HEADER_PATH := $(LOCAL_PATH)/armnn/include
-ARMNN_UTILS_HEADER_PATH := $(LOCAL_PATH)/armnn/src/armnnUtils
-OPENCL_HEADER_PATH := $(LOCAL_PATH)/clframework/include
-NN_HEADER_PATH := $(LOCAL_PATH)/../../../frameworks/ml/nn/runtime/include
-
-# Variables to control CL/NEON/reference backend support
-# Set them to '0' to disable support for a specific backend
-ARMNN_COMPUTE_CL_ENABLED := 1
-ARMNN_COMPUTE_NEON_ENABLED := 1
-ARMNN_REF_ENABLED := 1
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLE),0)
-ARMNN_COMPUTE_CL_ENABLED := 0
-endif
-
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLE),0)
-ARMNN_COMPUTE_NEON_ENABLED := 0
-endif
-
-ifeq ($(ARMNN_REF_ENABLE),0)
-ARMNN_REF_ENABLED := 0
-endif
-
-#######################
-# libarmnn-driver@1.0 #
-#######################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libarmnn-driver@1.0
-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
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(ARMNN_UTILS_HEADER_PATH) \
-        $(OPENCL_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -Wno-format-security
-
-ifeq ($(P_OR_LATER),1)
-# Required to build with the changes made to the Android ML framework starting from Android P,
-# regardless of the HAL version used for the build.
-LOCAL_CFLAGS+= \
-        -DARMNN_ANDROID_P
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS+= \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTECL_ENABLED
-endif # ARMNN_COMPUTE_CL_ENABLED == 1
-
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTENEON_ENABLED
-endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMNNREF_ENABLED
-endif # ARMNN_REF_ENABLED == 1
-
-LOCAL_SRC_FILES := \
-        1.0/ArmnnDriverImpl.cpp \
-        1.0/HalPolicy.cpp \
-        ArmnnDriverImpl.cpp \
-        DriverOptions.cpp \
-        ArmnnDevice.cpp \
-        ArmnnPreparedModel.cpp \
-        ModelToINetworkConverter.cpp \
-        RequestThread.cpp \
-        Utils.cpp \
-        ConversionUtils.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-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
-
-ifeq ($(P_OR_LATER),1)
-# Required to build the 1.0 version of the NN Driver on Android P and later versions,
-# as the 1.0 version of the NN API needs the 1.1 HAL headers to be included regardless.
-LOCAL_SHARED_LIBRARIES+= \
-        android.hardware.neuralnetworks@1.1
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-ifeq ($(P_OR_LATER),1)
-# The following target is available starting from Android P
-
-#######################
-# libarmnn-driver@1.1 #
-#######################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libarmnn-driver@1.1
-ifeq ($(Q_OR_LATER),1)
-# "eng" is deprecated in Android Q
-LOCAL_MODULE_TAGS := optional
-else
-LOCAL_MODULE_TAGS := eng optional
-endif
-#PRODUCT_PACKAGES_ENG := libarmnn-driver@1.1
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(ARMNN_UTILS_HEADER_PATH) \
-        $(OPENCL_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -Wno-format-security \
-        -DARMNN_ANDROID_P \
-        -DARMNN_ANDROID_NN_V1_1
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS+= \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTECL_ENABLED
-endif # ARMNN_COMPUTE_CL_ENABLED == 1
-
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTENEON_ENABLED
-endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMNNREF_ENABLED
-endif # ARMNN_REF_ENABLED == 1
-
-LOCAL_SRC_FILES := \
-        1.0/ArmnnDriverImpl.cpp \
-        1.0/HalPolicy.cpp \
-        1.1/ArmnnDriverImpl.cpp \
-        1.1/HalPolicy.cpp \
-        ArmnnDriverImpl.cpp \
-        DriverOptions.cpp \
-        ArmnnDevice.cpp \
-        ArmnnPreparedModel.cpp \
-        ModelToINetworkConverter.cpp \
-        RequestThread.cpp \
-        Utils.cpp \
-        ConversionUtils.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(Q_OR_LATER),1)
-# The following target is available starting from Android Q
-
-#######################
-# libarmnn-driver@1.2 #
-#######################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libarmnn-driver@1.2
-LOCAL_MODULE_TAGS := optional
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(ARMNN_UTILS_HEADER_PATH) \
-        $(OPENCL_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -Wno-format-security \
-        -DARMNN_ANDROID_Q \
-        -DARMNN_ANDROID_NN_V1_2
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS+= \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTECL_ENABLED
-endif # ARMNN_COMPUTE_CL_ENABLED == 1
-
-ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMCOMPUTENEON_ENABLED
-endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-
-ifeq ($(ARMNN_REF_ENABLED),1)
-LOCAL_CFLAGS += \
-        -DARMNNREF_ENABLED
-endif # ARMNN_REF_ENABLED == 1
-
-LOCAL_SRC_FILES := \
-        1.0/ArmnnDriverImpl.cpp \
-        1.0/HalPolicy.cpp \
-        1.1/ArmnnDriverImpl.cpp \
-        1.1/HalPolicy.cpp \
-        1.2/ArmnnDriverImpl.cpp \
-        1.2/HalPolicy.cpp \
-        ArmnnDevice.cpp \
-        ArmnnDriverImpl.cpp \
-        ArmnnPreparedModel.cpp \
-        ArmnnPreparedModel_1_2.cpp \
-        ConversionUtils.cpp \
-        DriverOptions.cpp \
-        ModelToINetworkConverter.cpp \
-        RequestThread.cpp \
-        Utils.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libutils \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0 \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hardware.neuralnetworks@1.2
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-endif # PLATFORM_VERSION == Q
-
-#####################################################
-# android.hardware.neuralnetworks@1.0-service-armnn #
-#####################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-armnn.rc
-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_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS += \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
-LOCAL_SRC_FILES := \
-        service.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.0
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        libdl \
-        libhardware \
-        liblog \
-        libtextclassifier_hash \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(P_OR_LATER),1)
-# Required to build the 1.0 version of the NN Driver on Android P and later versions,
-# as the 1.0 version of the NN API needs the 1.1 HAL headers to be included regardless.
-LOCAL_SHARED_LIBRARIES+= \
-        android.hardware.neuralnetworks@1.1
-endif # PLATFORM_VERSION == 9
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-ifeq ($(P_OR_LATER),1)
-# The following target is available starting from Android P
-
-#####################################################
-# android.hardware.neuralnetworks@1.1-service-armnn #
-#####################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-armnn.rc
-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_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -DARMNN_ANDROID_NN_V1_1
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS += \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
-        -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
-LOCAL_SRC_FILES := \
-        service.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.1
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        libdl \
-        libhardware \
-        liblog \
-        libtextclassifier_hash \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(Q_OR_LATER),1)
-# The following target is available starting from Android Q
-
-#####################################################
-# android.hardware.neuralnetworks@1.2-service-armnn #
-#####################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-armnn.rc
-LOCAL_MODULE_TAGS := optional
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-# Mark source files as dependent on Android.mk
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_C_INCLUDES := \
-        $(ARMNN_HEADER_PATH) \
-        $(NN_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -DARMNN_ANDROID_NN_V1_2 \
-        -DBOOST_NO_AUTO_PTR
-
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
-LOCAL_CFLAGS += \
-        -UNDEBUG
-endif # ARMNN_DRIVER_DEBUG == 1
-
-LOCAL_SRC_FILES := \
-        service.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_program_options \
-        libboost_system \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.2
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        libdl \
-        libhardware \
-        liblog \
-        libtextclassifier_hash \
-        libutils \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0 \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hardware.neuralnetworks@1.2
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-endif # PLATFORM_VERSION == Q
-
-##########################
-# armnn module and tests #
-##########################
-# Note we use ANDROID_NN_DRIVER_LOCAL_PATH rather than LOCAL_PATH because LOCAL_PATH will be overwritten
-# when including other .mk files that set it.
-include $(ANDROID_NN_DRIVER_LOCAL_PATH)/armnn/Android.mk
-include $(ANDROID_NN_DRIVER_LOCAL_PATH)/test/Android.mk
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 93bfa69..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,313 +0,0 @@
-#
-# Copyright © 2017 ARM Ltd. All rights reserved.
-# SPDX-License-Identifier: MIT
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# Configure these paths if you move the source or Khronos headers
-#
-OPENCL_HEADER_PATH := $(LOCAL_PATH)/../../mali/product/khronos/original
-NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
-ARMNN_HEADER_PATH := $(LOCAL_PATH)/../armnn/include
-ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/..
-
-##########################
-# armnn-driver-tests@1.0 #
-##########################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := armnn-driver-tests@1.0
-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
-# 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_HEADER_PATH) \
-        $(ARMNN_DRIVER_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -O0 \
-        -UNDEBUG
-
-ifeq ($(P_OR_LATER),1)
-# Required to build with the changes made to the Android ML framework starting from Android P,
-# regardless of the HAL version used for the build.
-LOCAL_CFLAGS+= \
-        -DARMNN_ANDROID_P
-endif # PLATFORM_VERSION == 9
-
-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 \
-        1.0/Lstm.cpp \
-        Tests.cpp \
-        UtilsTests.cpp \
-        Concurrent.cpp \
-        FullyConnected.cpp \
-        GenericLayerTests.cpp \
-        DriverTestHelpers.cpp \
-        SystemProperties.cpp \
-        Concat.cpp \
-        TestTensor.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_system \
-        libboost_unit_test_framework \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.0
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libtextclassifier_hash \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(P_OR_LATER),1)
-# Required to build the 1.0 version of the NN Driver on Android P and later versions,
-# as the 1.0 version of the NN API needs the 1.1 HAL headers to be included regardless.
-LOCAL_SHARED_LIBRARIES+= \
-        android.hardware.neuralnetworks@1.1
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-ifeq ($(P_OR_LATER),1)
-# The following target is available starting from Android P
-
-##########################
-# armnn-driver-tests@1.1 #
-##########################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := armnn-driver-tests@1.1
-ifeq ($(Q_OR_LATER),1)
-# "eng" is deprecated in Android Q
-LOCAL_MODULE_TAGS := optional
-else
-LOCAL_MODULE_TAGS := eng optional
-endif
-#PRODUCT_PACKAGES_ENG := libarmnn
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-# 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_HEADER_PATH) \
-        $(ARMNN_DRIVER_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -O0 \
-        -UNDEBUG \
-        -DARMNN_ANDROID_P \
-        -DARMNN_ANDROID_NN_V1_1
-
-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 \
-        1.1/Mean.cpp \
-        1.1/Transpose.cpp \
-        1.0/Lstm.cpp \
-        1.1/Lstm.cpp \
-        Tests.cpp \
-        UtilsTests.cpp \
-        Concurrent.cpp \
-        FullyConnected.cpp \
-        GenericLayerTests.cpp \
-        DriverTestHelpers.cpp \
-        SystemProperties.cpp \
-        Concat.cpp \
-        TestTensor.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_system \
-        libboost_unit_test_framework \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.1
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libtextclassifier_hash \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(Q_OR_LATER),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libnativewindow \
-        libui \
-        libfmq \
-        libcutils \
-        android.hardware.neuralnetworks@1.2
-endif # PLATFORM_VERSION == Q
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-endif # PLATFORM_VERSION == 9
-
-ifeq ($(Q_OR_LATER),1)
-# The following target is available starting from Android Q
-
-##########################
-# armnn-driver-tests@1.2 #
-##########################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := armnn-driver-tests@1.2
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-LOCAL_PROPRIETARY_MODULE := true
-
-# 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_HEADER_PATH) \
-        $(ARMNN_DRIVER_HEADER_PATH)
-
-LOCAL_CFLAGS := \
-        -std=$(CPP_VERSION) \
-        -fexceptions \
-        -Werror \
-        -O0 \
-        -UNDEBUG \
-        -DARMNN_ANDROID_Q \
-        -DARMNN_ANDROID_NN_V1_2
-
-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 \
-        1.1/Mean.cpp \
-        1.1/Transpose.cpp \
-        1.2/Dilation.cpp \
-        1.2/Capabilities.cpp \
-        1.0/Lstm.cpp \
-        1.1/Lstm.cpp \
-        1.2/Lstm.cpp \
-        Tests.cpp \
-        UtilsTests.cpp \
-        Concurrent.cpp \
-        FullyConnected.cpp \
-        GenericLayerTests.cpp \
-        DriverTestHelpers.cpp \
-        SystemProperties.cpp \
-        Concat.cpp \
-        TestTensor.cpp
-
-LOCAL_STATIC_LIBRARIES := \
-        libneuralnetworks_common \
-        libboost_log \
-        libboost_system \
-        libboost_unit_test_framework \
-        libboost_thread \
-        libboost_filesystem \
-        armnn-arm_compute
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-        libarmnn-driver@1.2
-
-LOCAL_SHARED_LIBRARIES := \
-        libbase \
-        libcutils \
-        libfmq \
-        libhidlbase \
-        libhidltransport \
-        libhidlmemory \
-        liblog \
-        libnativewindow \
-        libtextclassifier_hash \
-        libui \
-        libutils \
-        android.hardware.neuralnetworks@1.0 \
-        android.hardware.neuralnetworks@1.1 \
-        android.hardware.neuralnetworks@1.2 \
-        android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0
-
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
-LOCAL_SHARED_LIBRARIES+= \
-        libOpenCL
-endif
-
-include $(BUILD_EXECUTABLE)
-
-endif # PLATFORM_VERSION == Q