diff options
author | brettw <brettw@chromium.org> | 2015-09-18 12:58:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 19:59:32 +0000 |
commit | 717185dc6e6c480e7aa7969153f235eb450e12cf (patch) | |
tree | 9ec4c6cbfc8a6d6cac384292052c066c978221cf | |
parent | 6a07d9a158c8cf496200993505d1395dd78277a7 (diff) | |
download | chromium_src-717185dc6e6c480e7aa7969153f235eb450e12cf.zip chromium_src-717185dc6e6c480e7aa7969153f235eb450e12cf.tar.gz chromium_src-717185dc6e6c480e7aa7969153f235eb450e12cf.tar.bz2 |
Make deps of GN groups public.
Theses are implicitly public today, but I'm going to remove some transitional code that will change the default to be private.
Some template instantiations needed to be updated that themselves expand to groups.
Review URL: https://codereview.chromium.org/1356493004
Cr-Commit-Position: refs/heads/master@{#349747}
-rw-r--r-- | base/BUILD.gn | 2 | ||||
-rw-r--r-- | build/config/android/rules.gni | 28 | ||||
-rw-r--r-- | chrome/BUILD.gn | 28 | ||||
-rw-r--r-- | chrome/chrome_repack_locales.gni | 2 | ||||
-rw-r--r-- | components/resources/BUILD.gn | 2 | ||||
-rw-r--r-- | components/strings/BUILD.gn | 2 | ||||
-rw-r--r-- | content/browser/devtools/BUILD.gn | 2 | ||||
-rw-r--r-- | content/public/android/BUILD.gn | 2 | ||||
-rw-r--r-- | extensions/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/android/BUILD.gn | 2 | ||||
-rw-r--r-- | remoting/resources/BUILD.gn | 2 | ||||
-rw-r--r-- | ui/app_list/resources/BUILD.gn | 2 | ||||
-rw-r--r-- | ui/gl/BUILD.gn | 6 | ||||
-rw-r--r-- | ui/resources/BUILD.gn | 2 | ||||
-rw-r--r-- | ui/strings/BUILD.gn | 2 | ||||
-rw-r--r-- | ui/views/resources/BUILD.gn | 2 |
16 files changed, 44 insertions, 44 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 84d8bf9..7216b25 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1578,7 +1578,7 @@ if (is_android) { "android/java/src/org/chromium/base/metrics/RecordUserAction.java", ] - deps = [ + public_deps = [ ":android_runtime_jni_headers", ] diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 1b492d7..1c12e87 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -84,14 +84,14 @@ template("generate_jni") { } group(target_name) { - deps = [] + public_deps = [] forward_variables_from(invoker, [ "deps", "public_deps", "visibility", ]) - deps += [ ":$foreach_target_name" ] + public_deps += [ ":$foreach_target_name" ] public_configs = [ ":jni_includes_${target_name}" ] } } @@ -183,14 +183,14 @@ template("generate_jar_jni") { } group(target_name) { - deps = [] + public_deps = [] forward_variables_from(invoker, [ "deps", "public_deps", "visibility", ]) - deps += jni_actions + public_deps += jni_actions public_configs = [ ":jni_includes_${target_name}" ] } } @@ -308,7 +308,7 @@ template("java_cpp_template") { group(final_target_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = [ + public_deps = [ ":$zip_srcjar_target_name", ] } @@ -391,7 +391,7 @@ template("java_cpp_enum") { group(final_target_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = [ + public_deps = [ ":$zip_srcjar_target_name", ] } @@ -511,7 +511,7 @@ template("jinja_template_resources") { } group(target_name) { - deps = [ + public_deps = [ ":${target_name}__build_config", ":${target_name}__template", ] @@ -574,7 +574,7 @@ template("locale_pak_resources") { } group(target_name) { - deps = [ + public_deps = [ ":${target_name}__build_config", ":${target_name}__create_resources_zip", ] @@ -674,7 +674,7 @@ template("android_resources") { group(final_target_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = [ + public_deps = [ ":${target_name}__process_resources", ] } @@ -737,7 +737,7 @@ template("java_strings_grd") { } group(target_name) { - deps = [ + public_deps = [ ":${target_name}__build_config", ":${target_name}__zip", ] @@ -793,7 +793,7 @@ template("java_strings_grd_prebuilt") { group(final_target_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = [ + public_deps = [ ":$zip_target_name", ] } @@ -1642,13 +1642,13 @@ template("android_apk") { group(target_name) { forward_variables_from(invoker, [ "data_deps" ]) - deps = _final_deps + public_deps = _final_deps } group("${target_name}_incremental") { data_deps = [] forward_variables_from(invoker, [ "data_deps" ]) data_deps += [ "//build/android/pylib/device/commands" ] - deps = _incremental_final_deps + public_deps = _incremental_final_deps } } @@ -1966,7 +1966,7 @@ template("create_native_executable_dist") { group(template_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = [ + public_deps = [ ":$copy_target_name", ] } diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 9c7e07c..711fc35 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -335,31 +335,31 @@ if (is_multi_dll_chrome) { # GYP version: chromium_browser_dependencies variable in chrome.gyp group("browser_dependencies") { - deps = [ + public_deps = [ "//chrome/browser", "//chrome/common", "//sync", ] if (!is_ios) { - deps += [ "//ppapi/host" ] + public_deps += [ "//ppapi/host" ] } if (enable_basic_printing || enable_print_preview) { - deps += [ "//printing" ] + public_deps += [ "//printing" ] if (enable_print_preview) { - deps += [ "//chrome/service" ] + public_deps += [ "//chrome/service" ] } } } # GYP version: chromium_child_dependencies variable in chrome.gyp group("child_dependencies") { - deps = [ + public_deps = [ "//chrome/common", "//sync", ] if (!is_ios) { - deps += [ + public_deps += [ "//chrome/browser/devtools", "//chrome/child", "//chrome/plugin", @@ -370,11 +370,11 @@ group("child_dependencies") { ] } if (cld_version == 2) { - deps += [ "//third_party/cld_2:cld2_platform_impl" ] + public_deps += [ "//third_party/cld_2:cld2_platform_impl" ] } if (enable_nacl) { - deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] + public_deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] } } @@ -449,7 +449,7 @@ if (is_win) { # GYP version: chrome/chrome_resources.gyp:chrome_resources group("resources") { - deps = [ + public_deps = [ # Note: GYP lists some dependencies in addition to these actions. However, # these are just dependencies for the actions themselves, which our actions # list individually when needed. @@ -459,13 +459,13 @@ group("resources") { ] if (enable_extensions) { - deps += [ "//chrome/common:extensions_api_resources" ] + public_deps += [ "//chrome/common:extensions_api_resources" ] } } # GYP version: chrome/chrome_resources.gyp:chrome_extra_resources group("extra_resources") { - deps = [ + public_deps = [ "//chrome/browser/resources:invalidations_resources", "//chrome/browser/resources:memory_internals_resources", "//chrome/browser/resources:net_internals_resources", @@ -474,7 +474,7 @@ group("extra_resources") { "//chrome/browser/resources:translate_internals_resources", ] if (!is_ios) { - deps += [ + public_deps += [ "//chrome/browser/resources:component_extension_resources", "//chrome/browser/resources:options_resources", "//chrome/browser/resources:settings_resources", @@ -482,11 +482,11 @@ group("extra_resources") { } if (is_chromeos) { - deps += [ "//chrome/browser/resources/chromeos/chromevox" ] + public_deps += [ "//chrome/browser/resources/chromeos/chromevox" ] } if (enable_extensions) { - deps += [ + public_deps += [ "//chrome/browser/resources:quota_internals_resources", "//chrome/browser/resources:sync_file_system_internals_resources", ] diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni index 566a2da..81cd092 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -164,6 +164,6 @@ template("chrome_repack_locales") { # The group that external targets depend on which collects all deps. group(group_target_name) { forward_variables_from(invoker, [ "visibility" ]) - deps = locale_targets + public_deps = locale_targets } } diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn index 90efa1e..d6544f9 100644 --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn @@ -6,7 +6,7 @@ import("//tools/grit/grit_rule.gni") # GYP version: components/components_resources.gyp:components_resources group("resources") { - deps = [ + public_deps = [ ":components_resources", ":components_scaled_resources", ] diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn index 77f4361..8af6c46 100644 --- a/components/strings/BUILD.gn +++ b/components/strings/BUILD.gn @@ -5,7 +5,7 @@ import("//tools/grit/grit_rule.gni") group("strings") { - deps = [ + public_deps = [ ":components_chromium_strings", ":components_google_chrome_strings", ":components_strings", diff --git a/content/browser/devtools/BUILD.gn b/content/browser/devtools/BUILD.gn index e65cfe7..595f94f 100644 --- a/content/browser/devtools/BUILD.gn +++ b/content/browser/devtools/BUILD.gn @@ -6,7 +6,7 @@ import("//tools/grit/grit_rule.gni") # In GYP: devtools_resources target. group("resources") { - deps = [ + public_deps = [ ":devtools_resources", ] } diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index b198f00..3526e43 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -162,7 +162,7 @@ generate_jni("content_jni_headers") { if (enable_webvr) { sources += [ "//content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java" ] - deps = [ + public_deps = [ "//third_party/cardboard-java:cardboard-java", ] } diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index e58246b..eaed2b1 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -14,7 +14,7 @@ assert(enable_extensions) # GYP version: extensions/extensions_resources.gyp:extensions_resources group("extensions_resources") { - deps = [ + public_deps = [ ":extensions_browser_resources", ":extensions_renderer_resources", ":extensions_resources_grd", diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn index 9519458..d25b7d5e 100644 --- a/mojo/android/BUILD.gn +++ b/mojo/android/BUILD.gn @@ -18,7 +18,7 @@ generate_jni("jni_headers") { "javatests/src/org/chromium/mojo/MojoTestCase.java", "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java", ] - deps = [ + public_deps = [ ":system_java_jni_headers", ] diff --git a/remoting/resources/BUILD.gn b/remoting/resources/BUILD.gn index d28753b..2f2fcbf 100644 --- a/remoting/resources/BUILD.gn +++ b/remoting/resources/BUILD.gn @@ -6,7 +6,7 @@ import("//remoting/remoting_locales.gni") import("//tools/grit/grit_rule.gni") group("resources") { - deps = [ + public_deps = [ ":copy_locales", ":strings", diff --git a/ui/app_list/resources/BUILD.gn b/ui/app_list/resources/BUILD.gn index 9f2f429..d42b3e7 100644 --- a/ui/app_list/resources/BUILD.gn +++ b/ui/app_list/resources/BUILD.gn @@ -6,7 +6,7 @@ import("//tools/grit/grit_rule.gni") import("//tools/grit/repack.gni") group("resources") { - deps = [ + public_deps = [ ":resources_grd", ] } diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn index 0eee63e..c63b290 100644 --- a/ui/gl/BUILD.gn +++ b/ui/gl/BUILD.gn @@ -352,13 +352,13 @@ if (is_android) { } generate_jni("gl_jni_headers") { - deps = [ - ":surface_jni_headers", - ] sources = [ "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java", ] + public_deps = [ + ":surface_jni_headers", + ] jni_package = "ui/gl" } } diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn index 3ff0bcf..48a23aee 100644 --- a/ui/resources/BUILD.gn +++ b/ui/resources/BUILD.gn @@ -7,7 +7,7 @@ import("//tools/grit/repack.gni") # GYP version: ui/resources/ui_resources.gyp:ui_resources group("resources") { - deps = [ + public_deps = [ ":ui_resources_grd", ":ui_unscaled_resources_grd", ":webui_resources_grd", diff --git a/ui/strings/BUILD.gn b/ui/strings/BUILD.gn index d91cdc9..82cad9f 100644 --- a/ui/strings/BUILD.gn +++ b/ui/strings/BUILD.gn @@ -7,7 +7,7 @@ import("//tools/grit/grit_rule.gni") # Meta target that includes both ui_strings and app_locale_settings. Most # targets want both. You can depend on the individually if you need to. group("strings") { - deps = [ + public_deps = [ ":ui_strings", ":app_locale_settings", ] diff --git a/ui/views/resources/BUILD.gn b/ui/views/resources/BUILD.gn index a7a9164..226a664 100644 --- a/ui/views/resources/BUILD.gn +++ b/ui/views/resources/BUILD.gn @@ -6,7 +6,7 @@ import("//tools/grit/grit_rule.gni") import("//tools/grit/repack.gni") group("resources") { - deps = [ + public_deps = [ ":resources_grd", ] } |