Merge pull request #24843 from asmorkalov:as/android_drop_aidl

asmorkalov · web-flow · commit ebc637d07d54 · 2024-01-12T13:45:39.000+03:00
Removed Android AIDL from build scrips and tutorials as it's not need since 4.9.0
diff --git a/cmake/android/android_gradle_projects.cmake b/cmake/android/android_gradle_projects.cmake
@@ -89,15 +89,11 @@ else()
   ocv_update(OPENCV_ANDROID_NAMESPACE_DECLARATION "")
 endif()
 
-# set android gradle java version in build.gradle and set aidl config
 if(NOT (ANDROID_GRADLE_PLUGIN_VERSION VERSION_LESS "8.0.0"))
   # AGP-8.0 requires a minimum JDK version of JDK17
   ocv_update(ANDROID_GRADLE_JAVA_VERSION_INIT "17")
-  # Enable aidl configuration for OpenCV compile with AGP-8.0
-  ocv_update(ANDROID_GRADLE_BUILD_FEATURE_AIDL "buildFeatures { aidl true }")
 else()
   ocv_update(ANDROID_GRADLE_JAVA_VERSION_INIT "1_8")
-  ocv_update(ANDROID_GRADLE_BUILD_FEATURE_AIDL "")
 endif()
 
 set(ANDROID_GRADLE_JAVA_VERSION "${ANDROID_GRADLE_JAVA_VERSION_INIT}" CACHE STRING "Android Gradle Java version")
diff --git a/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.markdown b/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.markdown
@@ -76,11 +76,10 @@ In addition to this instruction you can use some video guide, for example [this
     @endcode
     The fix was found [here](https://stackoverflow.com/questions/73225714/import-opencv-sdk-to-android-studio-chipmunk)
 
-6. OpenCV project uses `aidl` and `buildConfig` features. Please enable them in
+6. OpenCV project uses `buildConfig` feature. Please enable it in
    `MyApplication/OpenCV/build.gradle` file to `android` block:
     @code{.gradle}
     buildFeatures{
-        aidl true
         buildConfig true
     }
 
diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
@@ -17,7 +17,7 @@ ocv_add_module(java BINDINGS opencv_core opencv_imgproc PRIVATE_REQUIRED opencv_
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake)
 
-# UTILITY: glob specific sources and append them to list (type is in H, CPP, JAVA, AIDL)
+# UTILITY: glob specific sources and append them to list (type is in H, CPP, JAVA)
 macro(glob_more_specific_sources _type _root _output)
   unset(_masks)
   if(${_type} STREQUAL "H")
@@ -26,8 +26,6 @@ macro(glob_more_specific_sources _type _root _output)
     set(_masks "${_root}/cpp/*.cpp")
   elseif(${_type} STREQUAL "JAVA")
     set(_masks "${_root}/java/*.java" "${_root}/java/*.java.in")
-  elseif(${_type} STREQUAL "AIDL")
-    set(_masks "${_root}/java/*.aidl")
   endif()
   if (_masks)
     file(GLOB _result ${_masks})
diff --git a/modules/java/android_sdk/android_gradle_lib/build.gradle b/modules/java/android_sdk/android_gradle_lib/build.gradle
@@ -42,7 +42,6 @@ android {
         main {
             jniLibs.srcDirs = ['../../jni']
             java.srcDirs = ['src']  // TODO Use original files instead of copied into build directory
-            aidl.srcDirs = ['src']
             res.srcDirs = ['@OpenCV_SOURCE_DIR@/modules/java/android_sdk/android_gradle_lib/res']
             manifest.srcFile 'AndroidManifest.xml'
         }
diff --git a/modules/java/android_sdk/build.gradle.in b/modules/java/android_sdk/build.gradle.in
@@ -121,8 +121,6 @@ android {
         targetCompatibility JavaVersion.VERSION_@ANDROID_GRADLE_JAVA_VERSION_INIT@
     }
 
-    @ANDROID_GRADLE_BUILD_FEATURE_AIDL@
-
     buildTypes {
         debug {
             packagingOptions {
@@ -139,7 +137,6 @@ android {
     }
 
     buildFeatures {
-        aidl true
         prefabPublishing true
         buildConfig true
     }
@@ -153,7 +150,6 @@ android {
         main {
             jniLibs.srcDirs = ['native/libs']
             java.srcDirs = ['java/src']
-            aidl.srcDirs = ['java/src']
             res.srcDirs = ['java/res']
             manifest.srcFile 'java/AndroidManifest.xml'
         }
diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py
@@ -1240,13 +1240,13 @@ def finalize(self, output_jni_path):
 def copy_java_files(java_files_dir, java_base_path, default_package_path='org/opencv/'):
     global total_files, updated_files
     java_files = []
-    re_filter = re.compile(r'^.+\.(java|aidl|kt)(.in)?$')
+    re_filter = re.compile(r'^.+\.(java|kt)(.in)?$')
     for root, dirnames, filenames in os.walk(java_files_dir):
        java_files += [os.path.join(root, filename) for filename in filenames if re_filter.match(filename)]
     java_files = [f.replace('\\', '/') for f in java_files]
 
     re_package = re.compile(r'^package +(.+);')
-    re_prefix = re.compile(r'^.+[\+/]([^\+]+).(java|aidl|kt)(.in)?$')
+    re_prefix = re.compile(r'^.+[\+/]([^\+]+).(java|kt)(.in)?$')
     for java_file in java_files:
         src = checkFileRemap(java_file)
         with open(src, 'r') as f:
diff --git a/platforms/android/aar-template/OpenCV/build.gradle.template b/platforms/android/aar-template/OpenCV/build.gradle.template
@@ -39,7 +39,6 @@ android {
         }
     }
     buildFeatures {
-        aidl true
         prefabPublishing true
         buildConfig true
     }
@@ -52,7 +51,6 @@ android {
         main {
             java.srcDirs = ['src/main/java']
             //jniLibs.srcDirs = ['libs']
-            aidl.srcDirs = ['src/main/java']
         }
     }
 
@@ -85,4 +83,4 @@ publishing {
 }
 
 dependencies {
-}
+}
diff --git a/samples/android/15-puzzle/build.gradle.in b/samples/android/15-puzzle/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/camera-calibration/build.gradle.in b/samples/android/camera-calibration/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/color-blob-detection/build.gradle.in b/samples/android/color-blob-detection/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/face-detection/build.gradle.in b/samples/android/face-detection/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/image-manipulations/build.gradle.in b/samples/android/image-manipulations/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/mobilenet-objdetect/build.gradle.in b/samples/android/mobilenet-objdetect/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/qr-detection/build.gradle.in b/samples/android/qr-detection/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/tutorial-1-camerapreview/build.gradle.in b/samples/android/tutorial-1-camerapreview/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/tutorial-2-mixedprocessing/build.gradle.in b/samples/android/tutorial-2-mixedprocessing/build.gradle.in
@@ -33,7 +33,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/tutorial-3-cameracontrol/build.gradle.in b/samples/android/tutorial-3-cameracontrol/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/tutorial-4-opencl/build.gradle.in b/samples/android/tutorial-4-opencl/build.gradle.in
@@ -35,7 +35,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }
diff --git a/samples/android/video-recorder/build.gradle.in b/samples/android/video-recorder/build.gradle.in
@@ -19,7 +19,6 @@ android {
     sourceSets {
         main {
             java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
-            aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@
             res.srcDirs = @ANDROID_SAMPLE_RES_PATH@
             manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'
         }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ android {`
`42`	`42`	`main {`
`43`	`43`	`jniLibs.srcDirs = ['../../jni']`
`44`	`44`	`java.srcDirs = ['src'] // TODO Use original files instead of copied into build directory`
`45`		`- aidl.srcDirs = ['src']`
`46`	`45`	`res.srcDirs = ['@OpenCV_SOURCE_DIR@/modules/java/android_sdk/android_gradle_lib/res']`
`47`	`46`	`manifest.srcFile 'AndroidManifest.xml'`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ android {`
`121`	`121`	`targetCompatibility JavaVersion.VERSION_@ANDROID_GRADLE_JAVA_VERSION_INIT@`
`122`	`122`	`}`
`123`	`123`
`124`		`- @ANDROID_GRADLE_BUILD_FEATURE_AIDL@`
`125`		`-`
`126`	`124`	`buildTypes {`
`127`	`125`	`debug {`
`128`	`126`	`packagingOptions {`
`@@ -139,7 +137,6 @@ android {`
`139`	`137`	`}`
`140`	`138`
`141`	`139`	`buildFeatures {`
`142`		`- aidl true`
`143`	`140`	`prefabPublishing true`
`144`	`141`	`buildConfig true`
`145`	`142`	`}`
`@@ -153,7 +150,6 @@ android {`
`153`	`150`	`main {`
`154`	`151`	`jniLibs.srcDirs = ['native/libs']`
`155`	`152`	`java.srcDirs = ['java/src']`
`156`		`- aidl.srcDirs = ['java/src']`
`157`	`153`	`res.srcDirs = ['java/res']`
`158`	`154`	`manifest.srcFile 'java/AndroidManifest.xml'`
`159`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ android {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`buildFeatures {`
`42`		`- aidl true`
`43`	`42`	`prefabPublishing true`
`44`	`43`	`buildConfig true`
`45`	`44`	`}`
`@@ -52,7 +51,6 @@ android {`
`52`	`51`	`main {`
`53`	`52`	`java.srcDirs = ['src/main/java']`
`54`	`53`	`//jniLibs.srcDirs = ['libs']`
`55`		`- aidl.srcDirs = ['src/main/java']`
`56`	`54`	`}`
`57`	`55`	`}`
`58`	`56`
`@@ -85,4 +83,4 @@ publishing {`
`85`	`83`	`}`
`86`	`84`
`87`	`85`	`dependencies {`
`88`		`-}`
	`86`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ android {`
`19`	`19`	`sourceSets {`
`20`	`20`	`main {`
`21`	`21`	`java.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@`
`22`		`- aidl.srcDirs = @ANDROID_SAMPLE_JAVA_PATH@`
`23`	`22`	`res.srcDirs = @ANDROID_SAMPLE_RES_PATH@`
`24`	`23`	`manifest.srcFile '@ANDROID_SAMPLE_MANIFEST_PATH@'`
`25`	`24`	`}`