diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/config/android/internal_rules.gni | 25 | ||||
-rw-r--r-- | build/config/android/rules.gni | 21 |
2 files changed, 4 insertions, 42 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index d5ad627..ac1c7cb 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1572,9 +1572,8 @@ template("java_library_impl") { set_sources_assignment_filter([]) forward_variables_from(invoker, [ "testonly" ]) - assert( - defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir) || - defined(invoker.srcjars) || defined(invoker.srcjar_deps)) + assert(defined(invoker.java_files) || defined(invoker.srcjars) || + defined(invoker.srcjar_deps)) _base_path = "$target_gen_dir/$target_name" # Jar files can be needed at runtime (by Robolectric tests or java binaries), @@ -1676,26 +1675,6 @@ template("java_library_impl") { } _java_files = [] - if (defined(invoker.DEPRECATED_java_in_dir)) { - _src_dir = invoker.DEPRECATED_java_in_dir + "/src" - _src_dir_exists = exec_script("//build/dir_exists.py", - [ rebase_path(_src_dir, root_build_dir) ], - "string") - assert(_src_dir_exists == "False", - "In GN, java_in_dir should be the fully specified java directory " + - "(i.e. including the trailing \"/src\")") - - _java_files_build_rel = - exec_script("//build/android/gyp/find.py", - [ - "--pattern", - "*.java", - rebase_path(invoker.DEPRECATED_java_in_dir, - root_build_dir), - ], - "list lines") - _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir) - } if (defined(invoker.java_files)) { _java_files += invoker.java_files } diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 9ed3a69..b3f81a7 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. @@ -1272,10 +1266,6 @@ template("android_java_prebuilt") { # linker does relocation unpacking, so we can enable it unconditionally. # secondary_native_libs: the path of native libraries for secondary app abi. # -# 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" @@ -1572,8 +1562,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 = [] } @@ -1983,10 +1971,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" @@ -2047,9 +2031,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) { |