Revert of Add GN build rules to allow java_assertion_enabler to enable Java asserts.

build/config/android/internal_rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
-import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
 # java_binary, resource_rewriter, since we never need to depend on these).
 _java_target_whitelist = [
   "*:*_java",
   "*:*_javalib",
   "*:*_java_*",  # e.g. java_test_support
@@ skipping 989 matching lines @@
 
   template("process_java_prebuilt") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     assert(invoker.build_config != "")
     _build_config = invoker.build_config
     _rebased_build_config = rebase_path(_build_config, root_build_dir)
     assert(_rebased_build_config != "" || true)  # Mark used.
 
+    _proguard_preprocess =
+        defined(invoker.proguard_preprocess) && invoker.proguard_preprocess
     _input_jar_path = invoker.input_jar_path
     _output_jar_path = invoker.output_jar_path
 
-    _proguard_preprocess =
-        defined(invoker.proguard_preprocess) && invoker.proguard_preprocess
-
     _jar_excluded_patterns = []
     if (defined(invoker.jar_excluded_patterns)) {
       _jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     _strip_resource_classes = defined(invoker.strip_resource_classes) &&
                               invoker.strip_resource_classes
     _filter_jar = _jar_excluded_patterns != [] || _strip_resource_classes
 
-    _enable_assert =
-        defined(invoker.supports_android) && invoker.supports_android &&
-        (is_java_debug || dcheck_always_on)
-    assert(_enable_assert || true)  # Mark used.
+    if (_filter_jar) {
+      _filter_target = "${target_name}__filter"
+      _output_jar_target = _filter_target
+    }
+    if (_proguard_preprocess) {
+      _proguard_target = "${target_name}__proguard_process"
+      _output_jar_target = _proguard_target
+    }
+    if (!_filter_jar && !_proguard_preprocess) {
+      _copy_target = "${target_name}__copy"
+      _output_jar_target = _copy_target
+    }
 
     if (_filter_jar) {
-      _filter_target = "${target_name}__filter"
-
-      _filter_jar_path = "$target_out_dir/$target_name-filtered.jar"
+      _filtered_jar_path = _output_jar_path
+      if (_proguard_preprocess) {
+        _filtered_jar_path = "$target_out_dir/$target_name-filtered.jar"
+      }
       action(_filter_target) {
         script = "//build/android/gyp/jar.py"
         forward_variables_from(invoker,
                                [
                                  "deps",
                                  "public_deps",
                                ])
         inputs = [
           _build_config,
           _input_jar_path,
         ]
         outputs = [
-          _filter_jar_path,
+          _filtered_jar_path,
         ]
         args = [
           "--input-jar",
           rebase_path(_input_jar_path, root_build_dir),
           "--jar-path",
-          rebase_path(_filter_jar_path, root_build_dir),
+          rebase_path(_filtered_jar_path, root_build_dir),
           "--excluded-classes=$_jar_excluded_patterns",
         ]
         if (_strip_resource_classes) {
           args += [ "--strip-resource-classes-for=@FileArg($_rebased_build_config:javac:resource_packages)" ]
         }
       }
     }
 
     if (_proguard_preprocess) {
-      _output_jar_target = "${target_name}__proguard_process"
-      _proguard_output_jar = _output_jar_path
       _proguard_config_path = invoker.proguard_preprocess_config
-      proguard(_output_jar_target) {
+      proguard(_proguard_target) {
         if (_filter_jar) {
-          _proguard_input_jar = _filter_jar_path
-          deps = [
+          _proguard_input_jar = _filtered_jar_path
+          public_deps = [
             ":$_filter_target",
           ]
         } else {
           _proguard_input_jar = _input_jar_path
-          deps = []
+          public_deps = []
         }
         if (defined(invoker.deps)) {
-          deps += invoker.deps
+          deps = invoker.deps
         }
         if (defined(invoker.public_deps)) {
-          public_deps = invoker.public_deps
+          public_deps += invoker.public_deps
         }
         inputs = [
           _build_config,
           _proguard_config_path,
           _proguard_input_jar,
         ]
-        output_jar_path = _proguard_output_jar
+        output_jar_path = _output_jar_path
 
-        _rebased_input_paths =
-            [ rebase_path(_proguard_input_jar, root_build_dir) ]
+        _rebased_input_paths = [ rebase_path(_input_jar_path, root_build_dir) ]
         _rebased_proguard_configs =
             [ rebase_path(_proguard_config_path, root_build_dir) ]
         args = [
           "--input-paths=$_rebased_input_paths",
           "--proguard-configs=$_rebased_proguard_configs",
           "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
         ]
       }
-    } else if (_enable_assert) {
-      _output_jar_target = "${target_name}__assert"
-      _assert_output_jar = _output_jar_path
-      action(_output_jar_target) {
-        script = "$root_out_dir/bin/helper/java_assertion_enabler"
-        if (_filter_jar) {
-          _assert_input_jar = _filter_jar_path
-          deps = [
-            ":$_filter_target",
-            "//build/android/java_assertion_enabler",
-          ]
-        } else {
-          _assert_input_jar = _input_jar_path
-          deps = [
-            "//build/android/java_assertion_enabler",
-          ]
-        }
-        if (defined(invoker.deps)) {
-          deps += invoker.deps
-        }
-        if (defined(invoker.public_deps)) {
-          public_deps = invoker.public_deps
-        }
-        inputs = [
-          _assert_input_jar,
-        ]
-        outputs = [
-          _assert_output_jar,
-        ]
-        args = [
-          rebase_path(_assert_input_jar, root_build_dir),
-          rebase_path(_assert_output_jar, root_build_dir),
-        ]
-      }
-    } else {
-      _output_jar_target = "${target_name}__copy"
-      copy(_output_jar_target) {
-        if (_filter_jar) {
-          _copy_input_jar = _filter_jar_path
-          public_deps = [
-            ":$_filter_target",
-          ]
-        } else {
-          _copy_input_jar = _input_jar_path
-          public_deps = []
-        }
-        if (defined(invoker.deps)) {
-          deps = invoker.deps
-        }
-        if (defined(invoker.public_deps)) {
-          public_deps += invoker.public_deps
-        }
+    } else if (!_filter_jar) {
+      copy(_copy_target) {
+        forward_variables_from(invoker,
+                               [
+                                 "deps",
+                                 "public_deps",
+                               ])
         sources = [
-          _copy_input_jar,
+          _input_jar_path,
         ]
         outputs = [
           _output_jar_path,
         ]
       }
     }
 
     group(target_name) {
       forward_variables_from(invoker,
                              [
@@ skipping 674 matching lines @@
                              ])
 
       visibility = [
         ":$_ijar_target_name",
         ":$_template_name",
       ]
       if (_supports_android) {
         visibility += [ ":$_dex_target_name" ]
       }
 
-      supports_android = _supports_android
       build_config = _build_config
       input_jar_path = invoker.jar_path
       output_jar_path = _jar_path
 
       deps = [ ":$_build_config_target_name" ] + _deps + _jar_deps
     }
 
     generate_interface_jar(_ijar_target_name) {
       if (!defined(invoker.proguard_preprocess) ||
           !invoker.proguard_preprocess) {
@@ skipping 271 matching lines @@
       }
     }
 
     process_java_prebuilt(_process_prebuilt_target_name) {
       forward_variables_from(invoker,
                              [
                                "jar_excluded_patterns",
                                "proguard_preprocess",
                                "proguard_preprocess_config",
                              ])
-      supports_android = _supports_android
       build_config = _build_config
       input_jar_path = _javac_jar_path
       output_jar_path = _process_prebuilt_jar_path
 
       deps = [
         ":$_javac_target_name",
       ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
@@ skipping 590 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }