From ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 26 Feb 2020 17:00:39 +0000 Subject: IVGCVSW-4473 Android R pre Hal 1_3 build changes * Update ErrorStatus to V1_0::ErrorStatus * Update Request to V1_0::Request * Update OperandType to V1_2::OperandType * Add namespace android::nn::hal in ArmnnDriverImpl for R only * Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName * Add namespace V1_0 or V1_1 where necessary * Update Android.mk with R macro and android.hardware.neuralnetworks@1.3 * Remove androidnn.go * include IAllocator in DriverTestHelpers * Remove unused LOCAL_CFLAGS Signed-off-by: Kevin May Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853 Signed-off-by: Kevin May --- test/Android.mk | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'test/Android.mk') diff --git a/test/Android.mk b/test/Android.mk index 13a36b54..0448d187 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -42,12 +42,11 @@ LOCAL_CFLAGS := \ -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. +# Required to build with the changes made to the Android ML framework specific to Android R +ifeq ($(R_OR_LATER),1) LOCAL_CFLAGS+= \ - -DARMNN_ANDROID_P -endif # PLATFORM_VERSION == 9 + -DARMNN_ANDROID_R +endif # R or later ifeq ($(Q_OR_LATER),1) LOCAL_CFLAGS += \ @@ -108,6 +107,11 @@ LOCAL_SHARED_LIBRARIES+= \ android.hardware.neuralnetworks@1.2 endif # PLATFORM_VERSION == Q +ifeq ($(R_OR_LATER),1) +LOCAL_SHARED_LIBRARIES+= \ + android.hardware.neuralnetworks@1.3 +endif # R or later + ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1) LOCAL_SHARED_LIBRARIES+= \ libOpenCL @@ -148,9 +152,14 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DARMNN_ANDROID_P \ -DARMNN_ANDROID_NN_V1_1 +# Required to build with the changes made to the Android ML framework specific to Android R +ifeq ($(R_OR_LATER),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_R +endif # R or later + ifeq ($(Q_OR_LATER),1) LOCAL_CFLAGS += \ -DBOOST_NO_AUTO_PTR @@ -207,6 +216,11 @@ LOCAL_SHARED_LIBRARIES+= \ android.hardware.neuralnetworks@1.2 endif # PLATFORM_VERSION == Q +ifeq ($(R_OR_LATER),1) +LOCAL_SHARED_LIBRARIES+= \ + android.hardware.neuralnetworks@1.3 +endif # R or later + ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1) LOCAL_SHARED_LIBRARIES+= \ libOpenCL @@ -245,13 +259,14 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DARMNN_ANDROID_Q \ + -DBOOST_NO_AUTO_PTR \ -DARMNN_ANDROID_NN_V1_2 -ifeq ($(Q_OR_LATER),1) -LOCAL_CFLAGS += \ - -DBOOST_NO_AUTO_PTR -endif # PLATFORM_VERSION == Q or later +# Required to build with the changes made to the Android ML framework specific to Android R +ifeq ($(R_OR_LATER),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_R +endif # R or later LOCAL_SRC_FILES := \ 1.0/Convolution2D.cpp \ @@ -303,6 +318,11 @@ LOCAL_SHARED_LIBRARIES := \ android.hidl.allocator@1.0 \ android.hidl.memory@1.0 +ifeq ($(R_OR_LATER),1) +LOCAL_SHARED_LIBRARIES+= \ + android.hardware.neuralnetworks@1.3 +endif # R or later + ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1) LOCAL_SHARED_LIBRARIES+= \ libOpenCL @@ -310,4 +330,4 @@ endif include $(BUILD_EXECUTABLE) -endif # PLATFORM_VERSION == Q +endif # PLATFORM_VERSION == Q \ No newline at end of file -- cgit v1.2.1