diff --git a/tools/resources/OWNERS b/tools/resources/OWNERS index b6a4905ed28203..fb33baa04a3510 100644 --- a/tools/resources/OWNERS +++ b/tools/resources/OWNERS @@ -1,3 +1,4 @@ -agrieve@chromium.org +per-file generate_resource_whitelist.*=agrieve@chromium.org per-file generate_resource_whitelist.*=estevenson@chromium.org +per-file filter_resource_whitelist.*=agrieve@chromium.org per-file filter_resource_whitelist.*=zpeng@chromium.org diff --git a/tools/resources/dummy.c b/tools/resources/dummy.c deleted file mode 100644 index 1230b7059c03e8..00000000000000 --- a/tools/resources/dummy.c +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 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. - -int main(int argc, char**argv) { - return 0; -} diff --git a/tools/resources/generate_resource_whitelist.gni b/tools/resources/generate_resource_whitelist.gni index d663ea26aa39a7..33bc4b87a47159 100644 --- a/tools/resources/generate_resource_whitelist.gni +++ b/tools/resources/generate_resource_whitelist.gni @@ -21,24 +21,17 @@ # output = "$target_gen_dir/pak_whitelist.txt" # } template("generate_resource_whitelist") { - # Wrap the shared_library in an executable so that it does not get added - # as a data_dep. - # TODO(crbug/748113): Remove once GN has a way to specify compile-only deps. - executable("${target_name}__exec") { - forward_variables_from(invoker, [ "deps" ]) - sources = [ - "//tools/resources/dummy.c", - ] - } action(target_name) { - deps = [ - ":${target_name}__exec", - ] + forward_variables_from(invoker, [ "deps" ]) assert(is_android, "Resource whitelist currently implemented only on Android") script = "//tools/resources/generate_resource_whitelist.py" + inputs = [ + invoker.input, + ] + outputs = [ invoker.output, ]