From 826dd41dc4de616059a61fb0aaec432311372c6c Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Fri, 6 Dec 2019 11:40:42 +0000 Subject: IVGCVSW-4130 Remove clframework from android-nn-driver build. Signed-off-by: Colm Donelan Change-Id: I019bdab899de19c1a2cb6bbd72dd38ceb677d98b --- test/Android.mk | 313 -------------------------------------------------------- 1 file changed, 313 deletions(-) delete mode 100644 test/Android.mk (limited to 'test/Android.mk') diff --git a/test/Android.mk b/test/Android.mk deleted file mode 100644 index 93bfa695..00000000 --- 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 -- cgit v1.2.1