From 46fbf8c97a13a25876d93cb3e1683c59cc84b07f Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sun, 10 Jun 2018 01:18:28 -0400 Subject: Disable module deps in Android Framework builds Module-related functionality is not required in dm/bench at this point. Let's disable module deps flattening for now. As an immediate benefit we can reduce the deps visibility for some internal skjson targets. Bug: skia:8061 Change-Id: I0e09208964ca94b519121207ba1b6225059ef573 Reviewed-on: https://skia-review.googlesource.com/133822 Reviewed-by: Mike Klein Commit-Queue: Florin Malita --- gn/gn_to_bp_utils.py | 2 ++ modules/skjson/BUILD.gn | 15 +++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gn/gn_to_bp_utils.py b/gn/gn_to_bp_utils.py index 78217a79db..91fec4c288 100644 --- a/gn/gn_to_bp_utils.py +++ b/gn/gn_to_bp_utils.py @@ -33,6 +33,8 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude): # Grab the values from other targets that $name depends on (e.g. optional # Skia components, gms, tests, etc). for dep in js['targets'][name]['deps']: + if 'modules' in dep: + continue # Modules require special handling -- skip for now. if 'third_party' in dep: continue # We've handled all third-party DEPS as static or shared_libs. if 'none' in dep: diff --git a/modules/skjson/BUILD.gn b/modules/skjson/BUILD.gn index 9538c321d2..531f0e0443 100644 --- a/modules/skjson/BUILD.gn +++ b/modules/skjson/BUILD.gn @@ -43,13 +43,10 @@ source_set("tests") { ] deps = [ + ":skjson", "../..:gpu_tool_utils", "../..:skia", ] - - public_deps = [ - ":skjson", - ] } } @@ -66,13 +63,10 @@ source_set("bench") { ] deps = [ + ":skjson", "../..:skia", "../../third_party/rapidjson", ] - - public_deps = [ - ":skjson", - ] } } @@ -86,11 +80,8 @@ source_set("fuzz") { ] deps = [ - "../..:skia", - ] - - public_deps = [ ":skjson", + "../..:skia", ] } } -- cgit v1.2.3