diff options
author | Brett Wilson <brettw@chromium.org> | 2014-09-23 16:41:46 -0700 |
---|---|---|
committer | Brett Wilson <brettw@chromium.org> | 2014-09-23 23:42:24 +0000 |
commit | e5389527466d390b5653724a069008b9f1edcd5c (patch) | |
tree | b801a034992eec680db3afbfae5ed6dd6394ca7e /third_party | |
parent | 2261d6bc3936efca1a9387085d2ebbf367d38df4 (diff) | |
download | chromium_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 'third_party')
31 files changed, 53 insertions, 59 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 8c223ae..cdecbcd 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -29,10 +29,10 @@ config("libjpeg_turbo_config") { group("jpeg") { if (use_system_libjpeg) { libs = [ "jpeg" ] - direct_dependent_configs = [ ":system_libjpeg_config" ] + public_configs = [ ":system_libjpeg_config" ] } else if (use_libjpeg_turbo) { deps = [ "//third_party/libjpeg_turbo:libjpeg" ] - direct_dependent_configs = [ ":libjpeg_turbo_config" ] + public_configs = [ ":libjpeg_turbo_config" ] } else { deps = [ "//third_party/libjpeg:libjpeg" ] } diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index 3b7f91a..cc3701d 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -28,7 +28,7 @@ gypi_values = exec_script( component("boringssl") { sources = gypi_values.boringssl_lib_sources - direct_dependent_configs = [ ":openssl_config" ] + public_configs = [ ":openssl_config" ] cflags = [] defines = [ diff --git a/third_party/cld/BUILD.gn b/third_party/cld/BUILD.gn index 44416d4..30af5b8 100644 --- a/third_party/cld/BUILD.gn +++ b/third_party/cld/BUILD.gn @@ -91,7 +91,7 @@ static_library("cld") { "//build/config/compiler:chromium_code", ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":cld_config" ] + public_configs = [ ":cld_config" ] if (is_win) { defines = [ "COMPILER_MSVC" ] @@ -105,11 +105,7 @@ static_library("cld") { defines = [ "COMPILER_GCC" ] } - deps = [ - "//third_party/icu:icuuc", - ] - - forward_dependent_configs_from = [ + public_deps = [ "//third_party/icu:icuuc", ] } diff --git a/third_party/dom_distiller_js/BUILD.gn b/third_party/dom_distiller_js/BUILD.gn index 91bc138..61cc53e 100644 --- a/third_party/dom_distiller_js/BUILD.gn +++ b/third_party/dom_distiller_js/BUILD.gn @@ -9,9 +9,8 @@ config("dependent_config") { } source_set("proto") { - deps = [ ":dom_distiller_proto" ] - direct_dependent_configs = [ ":dependent_config" ] - forward_dependent_configs_from = [ ":dom_distiller_proto" ] + public_deps = [ ":dom_distiller_proto" ] + public_configs = [ ":dependent_config" ] } proto_library("dom_distiller_proto") { diff --git a/third_party/expat/BUILD.gn b/third_party/expat/BUILD.gn index aac9c62..78ddb05 100644 --- a/third_party/expat/BUILD.gn +++ b/third_party/expat/BUILD.gn @@ -8,7 +8,7 @@ if (is_linux) { } group("expat") { - direct_dependent_configs = [ ":expat_config" ] + public_configs = [ ":expat_config" ] } } else { config("expat_config") { @@ -24,7 +24,7 @@ if (is_linux) { "files/lib/xmltok.c", ] - direct_dependent_configs = [ ":expat_config" ] + public_configs = [ ":expat_config" ] defines = [ "_LIB" ] if (is_win) { diff --git a/third_party/fontconfig/BUILD.gn b/third_party/fontconfig/BUILD.gn index 24097a5..21f42ce 100644 --- a/third_party/fontconfig/BUILD.gn +++ b/third_party/fontconfig/BUILD.gn @@ -62,7 +62,7 @@ component("fontconfig") { "//build/config/linux:freetype2", ] - direct_dependent_configs = [ ":fontconfig_config" ] + public_configs = [ ":fontconfig_config" ] if (is_clang) { # Work around a null-conversion warning. See crbug.com/358852. diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn index 11e951a..803917f 100644 --- a/third_party/freetype2/BUILD.gn +++ b/third_party/freetype2/BUILD.gn @@ -65,7 +65,7 @@ shared_library("freetype2") { configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":freetype2_config" ] - direct_dependent_configs = [ ":freetype2_config" ] + public_configs = [ ":freetype2_config" ] libs = [ "z" ] } diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn index c3cba83..7f5b2e3 100644 --- a/third_party/harfbuzz-ng/BUILD.gn +++ b/third_party/harfbuzz-ng/BUILD.gn @@ -20,7 +20,7 @@ if (use_system_harfbuzz) { packages = [ "harfbuzz" ] } group("harfbuzz-ng") { - direct_dependent_configs = [ ":harfbuzz_pkgconfig" ] + public_configs = [ ":harfbuzz_pkgconfig" ] } } else { @@ -129,7 +129,7 @@ if (use_system_harfbuzz) { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":harfbuzz-ng_config" ] + public_configs = [ ":harfbuzz-ng_config" ] deps = [ "//third_party/icu:icuuc", diff --git a/third_party/iccjpeg/BUILD.gn b/third_party/iccjpeg/BUILD.gn index eec5fe8..86bdd73 100644 --- a/third_party/iccjpeg/BUILD.gn +++ b/third_party/iccjpeg/BUILD.gn @@ -12,6 +12,6 @@ source_set("iccjpeg") { "iccjpeg.h" ] - direct_dependent_configs = [ ":iccjpeg_config" ] + public_configs = [ ":iccjpeg_config" ] deps = [ "//third_party:jpeg" ] } diff --git a/third_party/jsoncpp/BUILD.gn b/third_party/jsoncpp/BUILD.gn index 0e78811..55189e7 100644 --- a/third_party/jsoncpp/BUILD.gn +++ b/third_party/jsoncpp/BUILD.gn @@ -27,7 +27,7 @@ source_set("jsoncpp") { "source/src/lib_json/json_writer.cpp", ] - direct_dependent_configs = [ ":jsoncpp_config" ] + public_configs = [ ":jsoncpp_config" ] defines = [ "JSON_USE_EXCEPTION=0", diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index b906270..2f2bb03 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -112,7 +112,7 @@ static_library("util") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libaddressinput_config" ] + public_configs = [ ":libaddressinput_config" ] include_dirs = [ "$root_gen_dir/third_party/libaddressinput" ] @@ -157,7 +157,7 @@ static_library("libaddressinput") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libaddressinput_config" ] + public_configs = [ ":libaddressinput_config" ] deps = [ ":strings", diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 5c3e483..02c2bf9 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -117,15 +117,14 @@ config("jingle_all_dependent_configs") { # From third_party/libjingle/libjingle.gyp's target_defaults. group("jingle_deps") { + public_deps = [ + "//third_party/expat", + ] deps = [ "//base", "//net", - "//third_party/expat", "//crypto:platform", ] - forward_dependent_configs_from = [ - "//third_party/expat", - ] } # GYP version: third_party/libjingle.gyp:libjingle diff --git a/third_party/libjpeg/BUILD.gn b/third_party/libjpeg/BUILD.gn index 18a16ee..063d7f31 100644 --- a/third_party/libjpeg/BUILD.gn +++ b/third_party/libjpeg/BUILD.gn @@ -75,5 +75,5 @@ source_set("libjpeg") { "//build/config/compiler:no_chromium_code", ] - direct_dependent_configs = [ ":libjpeg_config" ] + public_configs = [ ":libjpeg_config" ] } diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn index 26386a6..22d1347 100644 --- a/third_party/libphonenumber/BUILD.gn +++ b/third_party/libphonenumber/BUILD.gn @@ -49,15 +49,16 @@ static_library("libphonenumber_without_metadata") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libphonenumber_config" ] + public_configs = [ ":libphonenumber_config" ] + public_deps = [ + ":proto", + ] deps = [ ":proto", "//third_party/icu", "//third_party/protobuf:protobuf_lite", ] - - forward_dependent_configs_from = [ ":proto" ] } # Library used by clients that includes production metadata. @@ -70,10 +71,9 @@ static_library("libphonenumber") { #"src/phonenumbers/metadata.cc", ] - deps = [ + public_deps = [ ":libphonenumber_without_metadata", ] - forward_dependent_configs_from = deps } # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn index 0d2eeb4..2899108 100644 --- a/third_party/libpng/BUILD.gn +++ b/third_party/libpng/BUILD.gn @@ -64,7 +64,7 @@ source_set("libpng_sources") { } } - direct_dependent_configs = [ ":libpng_config" ] + public_configs = [ ":libpng_config" ] public_deps = [ "//third_party/zlib" ] } diff --git a/third_party/libusb/BUILD.gn b/third_party/libusb/BUILD.gn index bcc3845..891a2f6 100644 --- a/third_party/libusb/BUILD.gn +++ b/third_party/libusb/BUILD.gn @@ -51,7 +51,7 @@ static_library("libusb") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libusb_config" ] + public_configs = [ ":libusb_config" ] if (is_posix) { defines = [ diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn index 13a4f37..9ff55fc 100644 --- a/third_party/libwebp/BUILD.gn +++ b/third_party/libwebp/BUILD.gn @@ -193,7 +193,7 @@ group("libwebp") { ":libwebp_enc", ":libwebp_utils", ] - direct_dependent_configs = [ + public_configs = [ ":libwebp_config" ] if (use_dsp_neon) { diff --git a/third_party/libxml/BUILD.gn b/third_party/libxml/BUILD.gn index 455c0ea..73bb3dc 100644 --- a/third_party/libxml/BUILD.gn +++ b/third_party/libxml/BUILD.gn @@ -142,11 +142,11 @@ static_library("libxml") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libxml_config" ] - forward_dependent_configs_from = [ "//third_party/icu:icuuc" ] - - deps = [ + public_configs = [ ":libxml_config" ] + public_deps = [ "//third_party/icu:icuuc", + ] + deps = [ "//third_party/zlib", ] diff --git a/third_party/libxslt/BUILD.gn b/third_party/libxslt/BUILD.gn index 25f30bbc..68d06c2 100644 --- a/third_party/libxslt/BUILD.gn +++ b/third_party/libxslt/BUILD.gn @@ -60,7 +60,7 @@ static_library("libxslt") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":libxslt_config" ] + public_configs = [ ":libxslt_config" ] if (is_linux || is_android) { include_dirs = [ "linux" ] diff --git a/third_party/lzma_sdk/BUILD.gn b/third_party/lzma_sdk/BUILD.gn index 38a07e1..32333af 100644 --- a/third_party/lzma_sdk/BUILD.gn +++ b/third_party/lzma_sdk/BUILD.gn @@ -52,5 +52,5 @@ static_library("lzma_sdk") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":lzma_sdk_config" ] + public_configs = [ ":lzma_sdk_config" ] } diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn index 62c3387..a883d41 100644 --- a/third_party/mesa/BUILD.gn +++ b/third_party/mesa/BUILD.gn @@ -15,7 +15,7 @@ config("mesa_headers_config") { generated_src_dir = "src/chromium_gensrc" source_set("mesa_headers") { - direct_dependent_configs = [ ":mesa_headers_config" ] + public_configs = [ ":mesa_headers_config" ] } # This config must generally be prepended to the configs list so that the Mesa diff --git a/third_party/npapi/BUILD.gn b/third_party/npapi/BUILD.gn index 646b80a..09dd9b9 100644 --- a/third_party/npapi/BUILD.gn +++ b/third_party/npapi/BUILD.gn @@ -20,5 +20,5 @@ source_set("npapi") { "bindings/npruntime.h", ] - direct_dependent_configs = [ ":npapi_config" ] + public_configs = [ ":npapi_config" ] } diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn index 9accbdf..686a6b9 100644 --- a/third_party/opus/BUILD.gn +++ b/third_party/opus/BUILD.gn @@ -55,7 +55,7 @@ source_set("opus") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":opus_config" ] + public_configs = [ ":opus_config" ] if (is_win) { defines += [ diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn index 4119054..265499c 100644 --- a/third_party/protobuf/BUILD.gn +++ b/third_party/protobuf/BUILD.gn @@ -92,7 +92,7 @@ source_set("protobuf_lite") { if (is_win) { configs -= [ "//build/config/win:lean_and_mean" ] } - direct_dependent_configs = [ ":protobuf_config" ] + public_configs = [ ":protobuf_config" ] cflags = protobuf_lite_cflags @@ -169,7 +169,7 @@ source_set("protobuf_full") { if (is_win) { configs -= [ "//build/config/win:lean_and_mean" ] } - direct_dependent_configs = [ ":protobuf_config" ] + public_configs = [ ":protobuf_config" ] cflags = protobuf_lite_cflags } diff --git a/third_party/protobuf/proto_library.gni b/third_party/protobuf/proto_library.gni index f228f65..40fb80f 100644 --- a/third_party/protobuf/proto_library.gni +++ b/third_party/protobuf/proto_library.gni @@ -140,15 +140,15 @@ template("proto_library") { configs += invoker.extra_configs } - direct_dependent_configs = [ "//third_party/protobuf:using_proto" ] + public_configs = [ "//third_party/protobuf:using_proto" ] + public_deps = [ + # The generated headers reference headers within protobuf_lite, so + # dependencies must be able to find those headers too. + "//third_party/protobuf:protobuf_lite", + ] deps = [ ":$action_name", - "//third_party/protobuf:protobuf_lite", ] - - # The generated headers reference headers within protobuf_lite, so - # dependencies must be able to find those headers too. - forward_dependent_configs_from = [ "//third_party/protobuf:protobuf_lite" ] } } diff --git a/third_party/qcms/BUILD.gn b/third_party/qcms/BUILD.gn index d0802f0..b059319 100644 --- a/third_party/qcms/BUILD.gn +++ b/third_party/qcms/BUILD.gn @@ -23,7 +23,7 @@ source_set("qcms") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":qcms_config" ] + public_configs = [ ":qcms_config" ] if (cpu_arch == "x86" || cpu_arch == "x64") { defines = [ "SSE2_ENABLE" ] diff --git a/third_party/re2/BUILD.gn b/third_party/re2/BUILD.gn index f171652..d022e4f 100644 --- a/third_party/re2/BUILD.gn +++ b/third_party/re2/BUILD.gn @@ -59,7 +59,7 @@ static_library("re2") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":re2_config" ] + public_configs = [ ":re2_config" ] deps = [ "//base/third_party/dynamic_annotations", diff --git a/third_party/snappy/BUILD.gn b/third_party/snappy/BUILD.gn index 705cb8a..d5daf64 100644 --- a/third_party/snappy/BUILD.gn +++ b/third_party/snappy/BUILD.gn @@ -31,7 +31,7 @@ static_library("snappy") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":snappy_config" ] + public_configs = [ ":snappy_config" ] if (is_clang) { # snappy-stubs-internal.h unapologetically has: using namespace std diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn index b78bd11..602a84f 100644 --- a/third_party/sqlite/BUILD.gn +++ b/third_party/sqlite/BUILD.gn @@ -86,7 +86,7 @@ source_set("sqlite") { ] } - direct_dependent_configs = [ ":sqlite_config" ] + public_configs = [ ":sqlite_config" ] deps = [ "//third_party/icu", diff --git a/third_party/usrsctp/BUILD.gn b/third_party/usrsctp/BUILD.gn index 1361b96..504885e 100644 --- a/third_party/usrsctp/BUILD.gn +++ b/third_party/usrsctp/BUILD.gn @@ -87,7 +87,7 @@ static_library("usrsctp") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":usrsctp_config" ] + public_configs = [ ":usrsctp_config" ] if (use_openssl) { defines += [ "SCTP_USE_OPENSSL_SHA1" ] diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index 9ac85a5..0f21450 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -45,7 +45,7 @@ static_library("zlib") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":zlib_config" ] + public_configs = [ ":zlib_config" ] } static_library("minizip") { @@ -81,7 +81,7 @@ static_library("minizip") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - direct_dependent_configs = [ ":zlib_config" ] + public_configs = [ ":zlib_config" ] } static_library("zip") { |