Skip to content

Commit

Permalink
Revert "Cludge to prevent .so from being a data_dep in resource_white…
Browse files Browse the repository at this point in the history
…list"

This reverts commit 8e65260.

Reason for revert: Breaks monochrome arm64 builds
https://bugs.chromium.org/p/chromium/issues/detail?id=749003

Original change's description:
> Cludge to prevent .so from being a data_dep in resource_whitelist
> 
> BUG=748113
> 
> Change-Id: I9aa6fa7cc0f8b7e4c84d0eea11686033ebf45e6e
> Reviewed-on: https://chromium-review.googlesource.com/584170
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#489338}

TBR=dpranke@chromium.org,agrieve@chromium.org,kraynov@google.com

Change-Id: I65ccd9a1501a902efc8d87de7fb90732fd72ddb5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 748113, 749003
Reviewed-on: https://chromium-review.googlesource.com/586787
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489626}
  • Loading branch information
agrieve authored and Commit Bot committed Jul 26, 2017
1 parent 3526d3a commit a207fe6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 20 deletions.
3 changes: 2 additions & 1 deletion tools/resources/OWNERS
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions tools/resources/dummy.c

This file was deleted.

17 changes: 5 additions & 12 deletions tools/resources/generate_resource_whitelist.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down

0 comments on commit a207fe6

Please sign in to comment.