Remove support for DEPRECATED_java_in_dir

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index f0246756178b98dca7112e64029ef93fd57fedf7..138ed5675edd5011aecdf79ef6d73ac61740bf53 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1000,9 +1000,6 @@ template("junit_binary") {
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
-#   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
-#     this directory will be included in the library. This is only supported to
-#     ease the gyp->gn conversion and will be removed in the future.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   enable_errorprone: If true, enables the errorprone compiler.
@@ -1092,9 +1089,6 @@ template("java_prebuilt") {
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
-#   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
-#     this directory will be included in the library. This is only supported to
-#     ease the gyp->gn conversion and will be removed in the future.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   enable_errorprone: If true, enables the errorprone compiler.
@@ -1271,10 +1265,6 @@ template("android_java_prebuilt") {
 #     installation only on Android M or later. In these releases the system
 #     linker does relocation unpacking, so we can enable it unconditionally.
 #
-#   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
-#     this directory will be included in the library. This is only supported to
-#     ease the gyp->gn conversion and will be removed in the future.
-#
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
@@ -1571,8 +1561,6 @@ template("android_apk") {
 
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
-    } else if (defined(invoker.DEPRECATED_java_in_dir)) {
-      DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
@@ -1981,10 +1969,6 @@ template("android_apk") {
 #   apk_under_test: The apk being tested.
 #   isolate_file: Isolate file containing the list of test data dependencies.
 #
-#   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
-#     this directory will be included in the library. This is only supported to
-#     ease the gyp->gn conversion and will be removed in the future.
-#
 # Example
 #   instrumentation_test_apk("foo_test_apk") {
 #     android_manifest = "AndroidManifest.xml"
@@ -2045,9 +2029,8 @@ template("instrumentation_test_apk") {
     }
 
     create_dist_ijar = true
-    run_findbugs =
-        defined(invoker.run_findbugs) && invoker.run_findbugs &&
-        (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
+    run_findbugs = defined(invoker.run_findbugs) && invoker.run_findbugs &&
+                   defined(invoker.java_files)
   }
 
   group(target_name) {