Commit ddae81d0 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

build: Remove no-op calls to set_sources_assignment_filter

We no longer use set_sources_assignment_filter() anywhere in the chromium
build, so these are no longer needed.

Bug: 1018739
Change-Id: I1d4d4d40c479b8a638c962a21f5334d28a3488c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2456626
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#814748}
parent 28cfaa2a
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
import("//build/config/python.gni") import("//build/config/python.gni")
template("copy_ex") { template("copy_ex") {
set_sources_assignment_filter([])
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
......
...@@ -1137,7 +1137,6 @@ if (enable_java_templates) { ...@@ -1137,7 +1137,6 @@ if (enable_java_templates) {
} }
template("proguard") { template("proguard") {
set_sources_assignment_filter([])
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"data", "data",
...@@ -2218,7 +2217,6 @@ if (enable_java_templates) { ...@@ -2218,7 +2217,6 @@ if (enable_java_templates) {
# #
template("prepare_resources") { template("prepare_resources") {
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
set_sources_assignment_filter([])
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"deps", "deps",
...@@ -2410,7 +2408,6 @@ if (enable_java_templates) { ...@@ -2410,7 +2408,6 @@ if (enable_java_templates) {
# proguard_file_main_dex: (optional) # proguard_file_main_dex: (optional)
# #
template("compile_resources") { template("compile_resources") {
set_sources_assignment_filter([])
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"testonly", "testonly",
...@@ -3462,7 +3459,6 @@ if (enable_java_templates) { ...@@ -3462,7 +3459,6 @@ if (enable_java_templates) {
# TODO(crbug.com/1042017): Remove. # TODO(crbug.com/1042017): Remove.
not_needed(invoker, [ "no_build_hooks" ]) not_needed(invoker, [ "no_build_hooks" ])
set_sources_assignment_filter([])
forward_variables_from(invoker, [ "testonly" ]) forward_variables_from(invoker, [ "testonly" ])
_is_prebuilt = defined(invoker.jar_path) _is_prebuilt = defined(invoker.jar_path)
_is_annotation_processor = invoker.type == "java_annotation_processor" _is_annotation_processor = invoker.type == "java_annotation_processor"
......
...@@ -126,8 +126,6 @@ if (enable_java_templates) { ...@@ -126,8 +126,6 @@ if (enable_java_templates) {
# JNI target implementation. See generate_jni or generate_jar_jni for usage. # JNI target implementation. See generate_jni or generate_jar_jni for usage.
template("generate_jni_impl") { template("generate_jni_impl") {
set_sources_assignment_filter([])
_jni_output_dir = "${target_gen_dir}/${target_name}" _jni_output_dir = "${target_gen_dir}/${target_name}"
if (defined(invoker.jni_generator_include)) { if (defined(invoker.jni_generator_include)) {
_jni_generator_include = invoker.jni_generator_include _jni_generator_include = invoker.jni_generator_include
...@@ -423,7 +421,6 @@ if (enable_java_templates) { ...@@ -423,7 +421,6 @@ if (enable_java_templates) {
# include_path = "android/java/templates" # include_path = "android/java/templates"
# } # }
template("java_cpp_template") { template("java_cpp_template") {
set_sources_assignment_filter([])
forward_variables_from(invoker, [ "testonly" ]) forward_variables_from(invoker, [ "testonly" ])
_include_path = "//" _include_path = "//"
...@@ -508,7 +505,6 @@ if (enable_java_templates) { ...@@ -508,7 +505,6 @@ if (enable_java_templates) {
# ] # ]
# } # }
template("java_cpp_enum") { template("java_cpp_enum") {
set_sources_assignment_filter([])
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
...@@ -578,7 +574,6 @@ if (enable_java_templates) { ...@@ -578,7 +574,6 @@ if (enable_java_templates) {
# A FooSwitches.java file, defining a class named FooSwitches in the package # A FooSwitches.java file, defining a class named FooSwitches in the package
# my.java.package. # my.java.package.
template("java_cpp_strings") { template("java_cpp_strings") {
set_sources_assignment_filter([])
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
...@@ -653,7 +648,6 @@ if (enable_java_templates) { ...@@ -653,7 +648,6 @@ if (enable_java_templates) {
# A FooFeatures.java file, defining a class named FooFeatures in the package # A FooFeatures.java file, defining a class named FooFeatures in the package
# my.java.package. # my.java.package.
template("java_cpp_features") { template("java_cpp_features") {
set_sources_assignment_filter([])
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
...@@ -4116,7 +4110,6 @@ if (enable_java_templates) { ...@@ -4116,7 +4110,6 @@ if (enable_java_templates) {
# } # }
template("android_aidl") { template("android_aidl") {
action_with_pydeps(target_name) { action_with_pydeps(target_name) {
set_sources_assignment_filter([])
forward_variables_from(invoker, [ "testonly" ]) forward_variables_from(invoker, [ "testonly" ])
script = "//build/android/gyp/aidl.py" script = "//build/android/gyp/aidl.py"
...@@ -4193,7 +4186,6 @@ if (enable_java_templates) { ...@@ -4193,7 +4186,6 @@ if (enable_java_templates) {
# sources = [ "$proto_path/foo.proto" ] # sources = [ "$proto_path/foo.proto" ]
# } # }
template("proto_java_library") { template("proto_java_library") {
set_sources_assignment_filter([])
forward_variables_from(invoker, [ "testonly" ]) forward_variables_from(invoker, [ "testonly" ])
_template_name = target_name _template_name = target_name
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
template("mustache_pass") { template("mustache_pass") {
set_sources_assignment_filter([])
forward_variables_from(invoker, [ "testonly" ]) forward_variables_from(invoker, [ "testonly" ])
assert(defined(invoker.input)) assert(defined(invoker.input))
......
...@@ -500,12 +500,6 @@ template("mojom") { ...@@ -500,12 +500,6 @@ template("mojom") {
sources_list = invoker.sources sources_list = invoker.sources
} }
# Reset sources_assignment_filter for the BUILD.gn file to prevent
# regression during the migration of Chromium away from the feature.
# See docs/no_sources_assignment_filter.md for more information.
# TODO(crbug.com/1018739): remove this when migration is done.
set_sources_assignment_filter([])
# Listed sources may be relative to the current target dir, or they may be # Listed sources may be relative to the current target dir, or they may be
# absolute paths, including paths to generated mojom files. While those are # absolute paths, including paths to generated mojom files. While those are
# fine as-is for input references, deriving output paths can be more subtle. # fine as-is for input references, deriving output paths can be more subtle.
......
...@@ -317,8 +317,6 @@ template("test") { ...@@ -317,8 +317,6 @@ template("test") {
xctest_module_target = "//base/test:google_test_runner" xctest_module_target = "//base/test:google_test_runner"
} }
# See above call.
set_sources_assignment_filter([])
forward_variables_from(invoker, "*", [ "testonly" ]) forward_variables_from(invoker, "*", [ "testonly" ])
# Provide sensible defaults in case invoker did not define any of those # Provide sensible defaults in case invoker did not define any of those
......
...@@ -54,12 +54,6 @@ import("//build/compiled_action.gni") ...@@ -54,12 +54,6 @@ import("//build/compiled_action.gni")
template("flatbuffer") { template("flatbuffer") {
assert(defined(invoker.sources), "Need sources for flatbuffers_library") assert(defined(invoker.sources), "Need sources for flatbuffers_library")
# Don't apply OS-specific sources filtering to the assignments later on.
# Platform files should have gotten filtered out in the sources assignment
# when this template was invoked. If they weren't, it was on purpose and
# this template shouldn't re-apply the filter.
set_sources_assignment_filter([])
action_name = "${target_name}_gen" action_name = "${target_name}_gen"
source_set_name = target_name source_set_name = target_name
compiled_action_foreach(action_name) { compiled_action_foreach(action_name) {
......
...@@ -136,12 +136,6 @@ template("proto_library") { ...@@ -136,12 +136,6 @@ template("proto_library") {
assert(defined(invoker.sources), "Need sources for proto_library") assert(defined(invoker.sources), "Need sources for proto_library")
proto_sources = invoker.sources proto_sources = invoker.sources
# Don't apply OS-specific sources filtering to the assignments later on.
# Platform files should have gotten filtered out in the sources assignment
# when this template was invoked. If they weren't, it was on purpose and
# this template shouldn't re-apply the filter.
set_sources_assignment_filter([])
if (defined(invoker.generate_cc)) { if (defined(invoker.generate_cc)) {
generate_cc = invoker.generate_cc generate_cc = invoker.generate_cc
} else { } else {
......
...@@ -165,7 +165,6 @@ template("repack_locales") { ...@@ -165,7 +165,6 @@ template("repack_locales") {
bundle_output = bundle_output =
"{{bundle_resources_dir}}/${_output_locale}.lproj/locale.pak" "{{bundle_resources_dir}}/${_output_locale}.lproj/locale.pak"
} }
set_sources_assignment_filter([])
sources = [] sources = []
foreach(_pattern, invoker.source_patterns) { foreach(_pattern, invoker.source_patterns) {
sources += [ "${_pattern}${_input_locale}.pak" ] sources += [ "${_pattern}${_input_locale}.pak" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment