summaryrefslogtreecommitdiffstats
path: root/build/secondary/third_party
diff options
context:
space:
mode:
authorBrett Wilson <brettw@chromium.org>2014-09-23 16:41:46 -0700
committerBrett Wilson <brettw@chromium.org>2014-09-23 23:42:24 +0000
commite5389527466d390b5653724a069008b9f1edcd5c (patch)
treeb801a034992eec680db3afbfae5ed6dd6394ca7e /build/secondary/third_party
parent2261d6bc3936efca1a9387085d2ebbf367d38df4 (diff)
downloadchromium_src-e5389527466d390b5653724a069008b9f1edcd5c.zip
chromium_src-e5389527466d390b5653724a069008b9f1edcd5c.tar.gz
chromium_src-e5389527466d390b5653724a069008b9f1edcd5c.tar.bz2
Replace forward_dependent_configs with public_deps
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}
Diffstat (limited to 'build/secondary/third_party')
-rw-r--r--build/secondary/third_party/android_tools/BUILD.gn2
-rw-r--r--build/secondary/third_party/cacheinvalidation/BUILD.gn2
-rw-r--r--build/secondary/third_party/flac/BUILD.gn2
-rw-r--r--build/secondary/third_party/freetype/BUILD.gn2
-rw-r--r--build/secondary/third_party/google_toolbox_for_mac/BUILD.gn2
-rw-r--r--build/secondary/third_party/icu/BUILD.gn4
-rw-r--r--build/secondary/third_party/leveldatabase/BUILD.gn7
-rw-r--r--build/secondary/third_party/libjpeg_turbo/BUILD.gn2
-rw-r--r--build/secondary/third_party/libsrtp/BUILD.gn4
-rw-r--r--build/secondary/third_party/nss/BUILD.gn20
-rw-r--r--build/secondary/third_party/openmax_dl/dl/BUILD.gn2
11 files changed, 24 insertions, 25 deletions
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 1a54e15..14e6c07 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -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" ]
diff --git a/build/secondary/third_party/cacheinvalidation/BUILD.gn b/build/secondary/third_party/cacheinvalidation/BUILD.gn
index 018e7c8..15e2aa4 100644
--- a/build/secondary/third_party/cacheinvalidation/BUILD.gn
+++ b/build/secondary/third_party/cacheinvalidation/BUILD.gn
@@ -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",
diff --git a/build/secondary/third_party/flac/BUILD.gn b/build/secondary/third_party/flac/BUILD.gn
index 53a2b05..8a498bb 100644
--- a/build/secondary/third_party/flac/BUILD.gn
+++ b/build/secondary/third_party/flac/BUILD.gn
@@ -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",
diff --git a/build/secondary/third_party/freetype/BUILD.gn b/build/secondary/third_party/freetype/BUILD.gn
index ee70c4e..2b96239 100644
--- a/build/secondary/third_party/freetype/BUILD.gn
+++ b/build/secondary/third_party/freetype/BUILD.gn
@@ -43,7 +43,7 @@ source_set("freetype") {
"build",
]
- direct_dependent_configs = [ ":freetype_config" ]
+ public_configs = [ ":freetype_config" ]
deps = [
"//third_party/libpng",
diff --git a/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn b/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn
index 66c2404..4d6fa0e 100644
--- a/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn
+++ b/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn
@@ -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 += [
diff --git a/build/secondary/third_party/icu/BUILD.gn b/build/secondary/third_party/icu/BUILD.gn
index 1a21949..44a6b5d 100644
--- a/build/secondary/third_party/icu/BUILD.gn
+++ b/build/secondary/third_party/icu/BUILD.gn
@@ -256,7 +256,7 @@ component("icui18n") {
]
configs += [ ":icu_code" ]
- direct_dependent_configs = [ ":icu_config" ]
+ public_configs = [ ":icu_config" ]
cflags = []
if (is_android || is_linux) {
@@ -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" ]
diff --git a/build/secondary/third_party/leveldatabase/BUILD.gn b/build/secondary/third_party/leveldatabase/BUILD.gn
index 60a600b..ffe9fa6 100644
--- a/build/secondary/third_party/leveldatabase/BUILD.gn
+++ b/build/secondary/third_party/leveldatabase/BUILD.gn
@@ -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",
@@ -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",
]
}
diff --git a/build/secondary/third_party/libjpeg_turbo/BUILD.gn b/build/secondary/third_party/libjpeg_turbo/BUILD.gn
index f594fbe..78b59ae 100644
--- a/build/secondary/third_party/libjpeg_turbo/BUILD.gn
+++ b/build/secondary/third_party/libjpeg_turbo/BUILD.gn
@@ -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.
diff --git a/build/secondary/third_party/libsrtp/BUILD.gn b/build/secondary/third_party/libsrtp/BUILD.gn
index cfcae79..b0e0a91 100644
--- a/build/secondary/third_party/libsrtp/BUILD.gn
+++ b/build/secondary/third_party/libsrtp/BUILD.gn
@@ -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
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index 9c73e95e..31ed5a9 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -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",
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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 = []
@@ -1148,12 +1145,13 @@ if (is_linux) {
]
}
+ public_deps = [
+ ":nspr",
+ ]
deps = [
":nspr",
"//third_party/sqlite",
]
-
- forward_dependent_configs_from = [ ":nspr" ]
}
} # Windows/Mac/iOS.
diff --git a/build/secondary/third_party/openmax_dl/dl/BUILD.gn b/build/secondary/third_party/openmax_dl/dl/BUILD.gn
index a2aa4e0..067be17 100644
--- a/build/secondary/third_party/openmax_dl/dl/BUILD.gn
+++ b/build/secondary/third_party/openmax_dl/dl/BUILD.gn
@@ -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",