From d36b959dd166920146638f259cceac49ee5f3eba Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 4 Dec 2023 16:06:33 +0300 Subject: [PATCH] Drop Adnroid.mk and Application.mk in samples as they are not used with Gradle. --- .../tutorial-2-mixedprocessing/jni/Android.mk | 19 ------------- .../jni/Application.mk | 4 --- .../android/tutorial-4-opencl/jni/Android.mk | 27 ------------------- .../tutorial-4-opencl/jni/Application.mk | 4 --- 4 files changed, 54 deletions(-) delete mode 100644 samples/android/tutorial-2-mixedprocessing/jni/Android.mk delete mode 100644 samples/android/tutorial-2-mixedprocessing/jni/Application.mk delete mode 100644 samples/android/tutorial-4-opencl/jni/Android.mk delete mode 100644 samples/android/tutorial-4-opencl/jni/Application.mk diff --git a/samples/android/tutorial-2-mixedprocessing/jni/Android.mk b/samples/android/tutorial-2-mixedprocessing/jni/Android.mk deleted file mode 100644 index 6cd88bd7cf..0000000000 --- a/samples/android/tutorial-2-mixedprocessing/jni/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -ifdef OPENCV_ANDROID_SDK - ifneq ("","$(wildcard $(OPENCV_ANDROID_SDK)/OpenCV.mk)") - include ${OPENCV_ANDROID_SDK}/OpenCV.mk - else - include ${OPENCV_ANDROID_SDK}/sdk/native/jni/OpenCV.mk - endif -else - include ../../sdk/native/jni/OpenCV.mk -endif - -LOCAL_MODULE := mixed_sample -LOCAL_SRC_FILES := jni_part.cpp -LOCAL_LDLIBS += -llog -ldl - -include $(BUILD_SHARED_LIBRARY) diff --git a/samples/android/tutorial-2-mixedprocessing/jni/Application.mk b/samples/android/tutorial-2-mixedprocessing/jni/Application.mk deleted file mode 100644 index 4fffcb2838..0000000000 --- a/samples/android/tutorial-2-mixedprocessing/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -fexceptions -APP_ABI := armeabi-v7a -APP_PLATFORM := android-8 diff --git a/samples/android/tutorial-4-opencl/jni/Android.mk b/samples/android/tutorial-4-opencl/jni/Android.mk deleted file mode 100644 index dacd0f665c..0000000000 --- a/samples/android/tutorial-4-opencl/jni/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# add OpenCV -include $(CLEAR_VARS) -OPENCV_INSTALL_MODULES:=on -ifdef OPENCV_ANDROID_SDK - ifneq ("","$(wildcard $(OPENCV_ANDROID_SDK)/OpenCV.mk)") - include ${OPENCV_ANDROID_SDK}/OpenCV.mk - else - include ${OPENCV_ANDROID_SDK}/sdk/native/jni/OpenCV.mk - endif -else - include ../../sdk/native/jni/OpenCV.mk -endif - -ifndef OPENCL_SDK - $(error Specify OPENCL_SDK to Android OpenCL SDK location) -endif - -# add OpenCL -LOCAL_C_INCLUDES += $(OPENCL_SDK)/include -LOCAL_LDLIBS += -L$(OPENCL_SDK)/lib/$(TARGET_ARCH_ABI) -lOpenCL - -LOCAL_MODULE := JNIpart -LOCAL_SRC_FILES := jni.c CLprocessor.cpp -LOCAL_LDLIBS += -llog -lGLESv2 -lEGL -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/samples/android/tutorial-4-opencl/jni/Application.mk b/samples/android/tutorial-4-opencl/jni/Application.mk deleted file mode 100644 index 06db65762a..0000000000 --- a/samples/android/tutorial-4-opencl/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -APP_STL := gnustl_static -APP_GNUSTL_FORCE_CPP_FEATURES := exceptions rtti -APP_ABI := armeabi-v7a -APP_PLATFORM := android-14