Skip to content

Commit

Permalink
Replace forward_dependent_configs with public_deps
Browse files Browse the repository at this point in the history
This is the new name. It has the same meaning but additionally with a "you can use the headers" permission.

Rename direct_dependent_configs to public_configs. This is the new name with identical meaning.

TBR=jamesr

Review URL: https://codereview.chromium.org/595073002

Cr-Commit-Position: refs/heads/master@{#296302}
  • Loading branch information
Brett Wilson committed Sep 23, 2014
1 parent 2261d6b commit e538952
Show file tree
Hide file tree
Showing 108 changed files with 305 additions and 424 deletions.
23 changes: 9 additions & 14 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ component("ash") {

defines = [ "ASH_IMPLEMENTATION" ]

deps = [
public_deps = [
"//ash/resources",
"//ash/strings",
]
deps = [
"//base",
"//base:i18n",
"//base/third_party/dynamic_annotations",
Expand Down Expand Up @@ -50,11 +52,6 @@ component("ash") {
"//url",
]

forward_dependent_configs_from = [
"//ash/resources",
"//ash/strings",
]

if (is_win) {
sources -= [
"sticky_keys/sticky_keys_controller.cc",
Expand Down Expand Up @@ -134,8 +131,10 @@ component("ash_with_content") {

defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]

deps = [
public_deps = [
":ash",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//content/public/browser",
Expand All @@ -154,18 +153,16 @@ component("ash_with_content") {
"//ui/web_dialogs",
"//url",
]

forward_dependent_configs_from = [
":ash",
]
}

static_library("test_support") {
testonly = true
sources = gypi_values.ash_test_support_sources

deps = [
public_deps = [
":ash",
]
deps = [
"//ash/resources",
"//content/test:test_support",
"//skia",
Expand All @@ -179,8 +176,6 @@ static_library("test_support") {
"//ui/views:test_support",
]

forward_dependent_configs_from = [ ":ash" ]

if (is_win) {
sources += [
"test/test_metro_viewer_process_host.cc",
Expand Down
2 changes: 1 addition & 1 deletion base/allocator/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ if (!is_android) {
"//build/config/win:nominmax",
]

direct_dependent_configs = [ ":nocmt" ]
public_configs = [ ":nocmt" ]

deps += [
":prep_libc",
Expand Down
2 changes: 1 addition & 1 deletion base/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ source_set("test_support_perf") {
"//testing/gtest",
]

direct_dependent_configs = [ ":perf_test_config" ]
public_configs = [ ":perf_test_config" ]
}

source_set("run_all_unittests") {
Expand Down
10 changes: 5 additions & 5 deletions breakpad/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ if (is_mac) {
]

configs += [ ":internal_config" ]
direct_dependent_configs = [ ":breakpad_config" ]
public_configs = [ ":breakpad_config" ]

defines = [ "USE_PROTECTED_ALLOCATIONS=1" ]
include_dirs = [
Expand All @@ -310,7 +310,7 @@ if (is_mac) {
}

group("client") {
direct_dependent_configs = [ ":client_config" ]
public_configs = [ ":client_config" ]
}
}

Expand Down Expand Up @@ -447,7 +447,7 @@ if (is_linux || is_android) {

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":client_config" ]
public_configs = [ ":client_config" ]

if (cpu_arch == "arm" && is_chromeos) {
# Avoid running out of registers in
Expand Down Expand Up @@ -678,13 +678,13 @@ if (is_ios) {

if (is_win) {
group("client") {
direct_dependent_configs = [ ":client_config" ]
public_configs = [ ":client_config" ]
}

source_set("breakpad_handler") {
configs += [ ":handler_config" ]
if (is_win) {
direct_dependent_configs = [ ":handler_config" ]
public_configs = [ ":handler_config" ]
}

defines = [ "BREAKPAD_NO_TERMINATE_THREAD" ]
Expand Down
14 changes: 7 additions & 7 deletions build/config/android/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ template("generate_jni") {

group(target_name) {
deps = [ ":$foreach_target_name" ]
direct_dependent_configs = [ ":jni_includes_${target_name}" ]
public_configs = [ ":jni_includes_${target_name}" ]

if (defined(invoker.deps)) {
deps += invoker.deps
}
if (defined(invoker.forward_dependent_configs_from)) {
forward_dependent_configs_from = invoker.forward_dependent_configs_from
if (defined(invoker.public_deps)) {
public_deps = invoker.public_deps
}
}
}
Expand All @@ -95,7 +95,7 @@ template("generate_jni") {
# jar_file: the path to the .jar. If not provided, will default to the sdk's
# android.jar
#
# deps, forward_dependent_configs_from: As normal
# deps, public_deps: As normal
#
# Example
# generate_jar_jni("foo_jni") {
Expand Down Expand Up @@ -163,10 +163,10 @@ template("generate_jar_jni") {
if (defined(invoker.deps)) {
deps += invoker.deps
}
if (defined(invoker.forward_dependent_configs_from)) {
forward_dependent_configs_from = invoker.forward_dependent_configs_from
if (defined(invoker.public_deps)) {
public_deps = invoker.public_deps
}
direct_dependent_configs = [ ":jni_includes_${target_name}" ]
public_configs = [ ":jni_includes_${target_name}" ]
}
}

Expand Down
2 changes: 1 addition & 1 deletion build/secondary/testing/gmock/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static_library("gmock") {
# This project includes some stuff form gtest's guts.
include_dirs = [ "../gtest/include" ]

direct_dependent_configs = [
public_configs = [
":gmock_config",
"//testing/gtest:gtest_config",
]
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/testing/gtest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static_library("gtest") {
include_dirs = [ "." ]

all_dependent_configs = [ ":gtest_config" ]
direct_dependent_configs = [ ":gtest_direct_config" ]
public_configs = [ ":gtest_direct_config" ]

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/android_tools/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config("cpu_features_include") {
# //build/android/cpufeatures.gypi:cpufeatures
source_set("cpu_features") {
sources = [ "ndk/sources/android/cpufeatures/cpu-features.c" ]
direct_dependent_configs = [ ":cpu_features_include" ]
public_configs = [ ":cpu_features_include" ]

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/cacheinvalidation/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static_library("cacheinvalidation") {
"src/google/cacheinvalidation/include/types.h",
]

direct_dependent_configs = [ ":cacheinvalidation_config" ]
public_configs = [ ":cacheinvalidation_config" ]

deps = [
"src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/flac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static_library("flac") {

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":flac_config" ]
public_configs = [ ":flac_config" ]

include_dirs = [
"include",
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/freetype/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ source_set("freetype") {
"build",
]

direct_dependent_configs = [ ":freetype_config" ]
public_configs = [ ":freetype_config" ]

deps = [
"//third_party/libpng",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ component("google_toolbox_for_mac") {
":google_toolbox_for_mac_config",
"//build/config/compiler:no_chromium_code",
]
direct_dependent_configs = [ ":google_toolbox_for_mac_config" ]
public_configs = [ ":google_toolbox_for_mac_config" ]

if (!is_ios) {
sources += [
Expand Down
4 changes: 2 additions & 2 deletions build/secondary/third_party/icu/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ component("icui18n") {
]

configs += [ ":icu_code" ]
direct_dependent_configs = [ ":icu_config" ]
public_configs = [ ":icu_config" ]

cflags = []
if (is_android || is_linux) {
Expand Down Expand Up @@ -470,7 +470,7 @@ component("icuuc") {
"//build/config/compiler:no_chromium_code",
]

direct_dependent_configs = [ ":icu_config" ]
public_configs = [ ":icu_config" ]

if (is_win || icu_use_data_file) {
sources += [ "source/stubdata/stubdata.c" ]
Expand Down
7 changes: 4 additions & 3 deletions build/secondary/third_party/leveldatabase/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static_library("leveldatabase") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]

direct_dependent_configs = [ ":leveldatabase_config" ]
public_configs = [ ":leveldatabase_config" ]

deps = [
"//base",
Expand Down Expand Up @@ -150,12 +150,13 @@ if (!is_android) {
"src/util/testutil.h",
]

forward_dependent_configs_from = [ ":leveldatabase" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]

deps = [
public_deps = [
":leveldatabase",
]
deps = [
"//base",
]
}
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/libjpeg_turbo/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ source_set("libjpeg") {

configs += [ ":libjpeg_config" ]

direct_dependent_configs = [ ":libjpeg_config" ]
public_configs = [ ":libjpeg_config" ]

# MemorySanitizer doesn't support assembly code, so keep it disabled in
# MSan builds for now.
Expand Down
4 changes: 2 additions & 2 deletions build/secondary/third_party/libsrtp/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ config("system_libsrtp_config") {

if (use_system_libsrtp) {
group("libsrtp") {
direct_dependent_configs = [ ":libsrtp_config", ":system_libsrtp_config" ]
public_configs = [ ":libsrtp_config", ":system_libsrtp_config" ]
libs = [ "-lsrtp" ]
}
} else {
static_library("libsrtp") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":libsrtp_config" ]
public_configs = [ ":libsrtp_config" ]

sources = [
# includes
Expand Down
20 changes: 9 additions & 11 deletions build/secondary/third_party/nss/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ if (is_linux) {
"nspr/pr/src/threads/prtpd.c",
]

direct_dependent_configs = [ ":nspr_config" ]
public_configs = [ ":nspr_config" ]

configs -= [
"//build/config/compiler:chromium_code",
Expand Down Expand Up @@ -348,10 +348,10 @@ if (is_linux) {
"nss/lib/nss/nssver.c",
]

deps = [ ":nss_static" ]
public_deps = [ ":nss_static" ]

if (include_nss_root_certs) {
deps += [ ":nssckbi" ]
public_deps += [ ":nssckbi" ]
}

if (component_mode == "shared_library") {
Expand All @@ -362,8 +362,6 @@ if (is_linux) {
ldflags = [ rebase_path("nss/exports_win.def", root_build_dir) ]
}
}

forward_dependent_configs_from = deps
}

config("nssckbi_config") {
Expand Down Expand Up @@ -441,12 +439,11 @@ if (is_linux) {
configs += [ "//build/config/compiler:no_chromium_code" ]

include_dirs = [ "nss/lib/ckfw" ]
direct_dependent_configs = [ ":nssckbi_config" ]
public_configs = [ ":nssckbi_config" ]

deps = [
public_deps = [
":nss_static",
]
forward_dependent_configs_from = deps
}

config("nss_static_config") {
Expand Down Expand Up @@ -841,7 +838,7 @@ if (is_linux) {
]
}
configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":nss_static_config" ]
public_configs = [ ":nss_static_config" ]

cflags = []

Expand Down Expand Up @@ -1148,12 +1145,13 @@ if (is_linux) {
]
}

public_deps = [
":nspr",
]
deps = [
":nspr",
"//third_party/sqlite",
]

forward_dependent_configs_from = [ ":nspr" ]
}
} # Windows/Mac/iOS.

2 changes: 1 addition & 1 deletion build/secondary/third_party/openmax_dl/dl/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config("dl_config") {

# GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl
source_set("dl") {
direct_dependent_configs = [ ":dl_config" ]
public_configs = [ ":dl_config" ]
sources = [
"api/omxtypes.h",
"sp/api/omxSP.h",
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/tools/grit/grit_rule.gni
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ template("grit") {
# Deps set on the template invocation will go on the grit script running
# target rather than this library.
deps = [ ":$grit_custom_target" ]
direct_dependent_configs = [ ":$grit_config" ]
public_configs = [ ":$grit_config" ]

if (defined(invoker.visibility)) {
visibility = invoker.visibility
Expand Down
Loading

0 comments on commit e538952

Please sign in to comment.