0

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}
This commit is contained in:
Brett Wilson
2014-09-23 16:41:46 -07:00
parent 2261d6bc39
commit e538952746
108 changed files with 306 additions and 425 deletions
ash
base
allocator
test
breakpad
build
config
android
secondary
testing
third_party
android_tools
cacheinvalidation
flac
freetype
google_toolbox_for_mac
icu
leveldatabase
libjpeg_turbo
libsrtp
nss
openmax_dl
tools
cc
chrome
browser
test
utility
components
autofill
content
browser
core
browser
crash
browser
dom_distiller
content
core
infobars
invalidation
metrics
omnibox
password_manager
core
browser
content
BUILD.gn
common
public
browser
child
common
plugin
renderer
utility
shell
test
crypto
dbus
device/media_transfer_protocol
extensions
gin
google_apis
gpu/command_buffer/client
jingle
media/cast
BUILD.gn
logging
test
mojo
aura
bindings
environment
gles2
public
services
public
cpp
geometry
net
BUILD.gn
third_party
nss
ppapi
remoting
base
protocol
rlz
sdch
skia
sync
third_party
BUILD.gn
boringssl
cld
dom_distiller_js
expat
fontconfig
freetype2
harfbuzz-ng
iccjpeg
jsoncpp
libaddressinput
libjingle
libjpeg
libphonenumber
libpng
libusb
libwebp
libxml
libxslt
lzma_sdk
mesa
npapi
opus
protobuf
qcms
re2
snappy
sqlite
usrsctp
zlib
tools/generate_library_loader
ui
events
gl
ozone
platform

@ -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",
@ -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",
@ -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",
@ -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",
@ -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",

@ -184,7 +184,7 @@ if (!is_android) {
"//build/config/win:nominmax",
]
direct_dependent_configs = [ ":nocmt" ]
public_configs = [ ":nocmt" ]
deps += [
":prep_libc",

@ -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") {

@ -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 = [
@ -310,7 +310,7 @@ if (is_mac) {
}
group("client") {
direct_dependent_configs = [ ":client_config" ]
public_configs = [ ":client_config" ]
}
}
@ -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
@ -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" ]

@ -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
}
}
}
@ -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") {
@ -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}" ]
}
}

@ -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",
]

@ -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" ]

@ -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" ]

@ -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",

@ -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",

@ -43,7 +43,7 @@ source_set("freetype") {
"build",
]
direct_dependent_configs = [ ":freetype_config" ]
public_configs = [ ":freetype_config" ]
deps = [
"//third_party/libpng",

@ -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 += [

@ -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" ]

@ -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",
]
}

@ -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.

@ -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

@ -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.

@ -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",

@ -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

@ -478,20 +478,19 @@ component("cc") {
cflags = [ "/wd4267" ] # size_t -> int
}
public_deps = [
"//skia",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//gpu",
"//gpu/command_buffer/client:gles2_interface",
"//media",
"//skia",
"//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
]
forward_dependent_configs_from = [
"//skia",
]
defines = [ "CC_IMPLEMENTATION=1" ]
@ -628,11 +627,11 @@ source_set("test_support") {
public_deps = [
":cc",
"//gpu:test_support",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//gpu:test_support",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gl_in_process_context",
@ -650,10 +649,6 @@ source_set("test_support") {
if (!is_android) { # TODO(GYP) Enable on Android when osmesa links.
deps += [ "//third_party/mesa:osmesa" ]
}
forward_dependent_configs_from = [
"//gpu:test_support",
]
}
test("cc_unittests") {

@ -6,12 +6,14 @@
component("blink") {
output_name = "cc_blink"
public_deps = [
"//skia",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//cc",
"//gpu",
"//skia",
"//third_party/WebKit/public:blink",
"//ui/gfx",
"//ui/gfx/geometry",
@ -19,8 +21,6 @@ component("blink") {
defines = [ "CC_BLINK_IMPLEMENTATION" ]
forward_dependent_configs_from = [ "//skia" ]
sources = [
"cc_blink_export.h",
"scrollbar_impl.cc",

@ -33,6 +33,12 @@ static_library("browser") {
# iOS/non-iOS shared deps. New dependencies should generally be added in the
# non-iOS deps below.
public_deps = [
"//components/autofill/core/browser",
"//content/public/browser",
"//sql",
"//sync",
]
deps = [
"//base/allocator",
"//chrome:extra_resources",
@ -124,13 +130,6 @@ static_library("browser") {
"//ui/resources",
]
forward_dependent_configs_from = [
"//components/autofill/core/browser",
"//content/public/browser",
"//sql",
"//sync",
]
sources += rebase_path(gypi_values.chrome_browser_undo_sources,
".", "//chrome")
@ -243,13 +242,12 @@ static_library("browser") {
]
}
if (enable_extensions) {
public_deps += [ "//chrome/browser/extensions" ]
deps += [
"//chrome/browser/extensions",
"//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
"//chrome/common/extensions/api",
"//chrome/common/extensions/api:api_registration",
]
forward_dependent_configs_from += [ "//chrome/browser/extensions" ]
sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
".", "//chrome")
}
@ -521,14 +519,16 @@ static_library("browser") {
if (is_win) {
sources += rebase_path(gypi_values.chrome_browser_win_sources,
".", "//chrome")
public_deps += [
"//ui/views",
"//ui/views/controls/webview",
]
deps += [
"//chrome:version_header",
"//chrome/installer/util:strings",
"//third_party/iaccessible2",
"//third_party/isimpledom",
"//third_party/wtl",
"//ui/views",
"//ui/views/controls/webview",
#"chrome_process_finder", TODO(GYP)
#"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP)
#"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP)
@ -537,10 +537,6 @@ static_library("browser") {
#"../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages", TODO(GYP)
#"../win8/win8.gyp:metro_viewer", TODO(GYP)
]
forward_dependent_configs_from += [
"//ui/views",
"//ui/views/controls/webview",
]
} else {
# Non-Windows.
sources += rebase_path(gypi_values.chrome_browser_non_win_sources,
@ -775,11 +771,13 @@ source_set("test_support") {
"sync/profile_sync_service_mock.h",
]
deps = [
public_deps = [
":browser",
"//chrome/browser/ui:test_support",
]
deps = [
"//base:prefs_test_support",
"//chrome/browser",
"//chrome/browser/ui:test_support",
"//chrome/common",
"//chrome/common/safe_browsing:proto",
"//components/invalidation",
@ -795,11 +793,6 @@ source_set("test_support") {
"//ui/gfx",
]
forward_dependent_configs_from = [
":browser",
"//chrome/browser/ui:test_support",
]
if (!is_ios) {
deps += [
"//components/sessions:test_support",
@ -869,12 +862,10 @@ source_set("test_support") {
"policy/test/local_policy_test_server.cc",
"policy/test/local_policy_test_server.h",
]
policy_deps = [
public_deps += [
"//components/policy:policy_component_test_support",
"//components/policy:test_support",
]
deps += policy_deps
forward_dependent_configs_from += policy_deps
}
if (safe_browsing_mode == 1) {

@ -26,6 +26,10 @@ static_library("extensions") {
# However, this means browser_extensions and browser should more or less
# have the same dependencies. Once browser_extensions is untangled from
# browser, then we can clean up these dependencies.
public_deps = [
"//chrome/common/extensions/api",
"//content/public/browser",
]
deps = [
"//chrome:extra_resources",
"//chrome:resources",
@ -35,7 +39,6 @@ static_library("extensions") {
"//chrome/browser/devtools",
"//chrome/browser/history:in_memory_url_index_cache_proto",
"//chrome/common",
"//chrome/common/extensions/api",
"//chrome/common/extensions/api:api_registration",
"//chrome/common/net",
"//chrome/common/safe_browsing:proto",
@ -47,7 +50,6 @@ static_library("extensions") {
"//components/strings",
"//components/url_matcher",
"//content/app/resources",
"//content/public/browser",
"//content/public/common",
"//crypto",
"//device/bluetooth",
@ -76,11 +78,6 @@ static_library("extensions") {
"//storage/browser",
]
forward_dependent_configs_from = [
"//chrome/common/extensions/api",
"//content/public/browser",
]
if (is_chromeos) {
sources += rebase_path(
gypi_values.chrome_browser_extensions_chromeos_sources,

@ -18,7 +18,6 @@ static_library("ui") {
sources = []
defines = []
libs = []
forward_dependent_configs_from = []
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@ -27,6 +26,10 @@ static_library("ui") {
# However, this means browser_ui and browser should more or less
# have the same dependencies. Once browser_ui is untangled from
# browser, then we can clean up these dependencies.
public_deps = [
"//components/dom_distiller/core",
"//sync",
]
deps = [
# NOTE: New dependencies should generally be added in the OS!="ios"
# dependencies block below, rather than here.
@ -41,7 +44,6 @@ static_library("ui") {
"//chrome/common",
"//chrome/common/net",
"//components/auto_login_parser",
"//components/dom_distiller/core",
"//components/dom_distiller/webui",
"//components/feedback/proto",
"//components/invalidation",
@ -54,7 +56,6 @@ static_library("ui") {
"//content/public/common",
"//crypto",
"//skia",
"//sync",
"//third_party/cacheinvalidation",
"//third_party/icu",
"//third_party/libusb",
@ -72,11 +73,6 @@ static_library("ui") {
"//ui/strings",
]
forward_dependent_configs_from = [
"//components/dom_distiller/core",
"//sync",
]
if (!is_ios) {
sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources,
".", "//chrome")
@ -311,28 +307,22 @@ static_library("ui") {
if (is_win) {
sources += rebase_path(gypi_values.chrome_browser_ui_win_sources,
".", "//chrome")
public_deps += [
"//ui/views",
"//ui/views/controls/webview",
]
deps += [
"//chrome/installer/util:strings",
"//third_party/wtl",
"//third_party/iaccessible2",
"//third_party/isimpledom",
"//ui/app_list",
"//ui/views",
"//ui/views/controls/webview",
#'metro_utils', TODO(GYP)
#'../google_update/google_update.gyp:google_update', TODO(GYP)
]
forward_dependent_configs_from += [
"//ui/views",
"//ui/views/controls/webview",
]
} else { # 'OS!="win"
if (toolkit_views) {
deps += [
"//ui/views",
"//ui/views/controls/webview",
]
forward_dependent_configs_from += [
public_deps += [
"//ui/views",
"//ui/views/controls/webview",
]
@ -454,8 +444,10 @@ source_set("test_support") {
"website_settings/mock_permission_bubble_request.h",
]
deps = [
public_deps = [
":ui",
]
deps = [
"//chrome/app/theme:theme_resources",
"//chrome/browser",
"//content/public/browser",
@ -466,8 +458,4 @@ source_set("test_support") {
"//testing/gtest",
"//ui/base",
]
forward_dependent_configs_from = [
":ui",
]
}

@ -68,6 +68,9 @@ source_set("test_support") {
]
# New deps should go in the non-iOS section below.
public_deps = [
"//content/test:test_support",
]
deps = [
"//base:prefs_test_support",
"//base/test:test_support",
@ -91,7 +94,6 @@ source_set("test_support") {
"//components/signin/core/browser:test_support",
"//components/sync_driver:test_support",
"//content/public/app:both",
"//content/test:test_support",
"//ui/gfx:test_support",
"//net",
"//net:test_support",
@ -105,10 +107,6 @@ source_set("test_support") {
"//ui/message_center:test_support",
]
forward_dependent_configs_from = [
"//content/test:test_support",
]
if (!is_ios) {
deps += [
"//chrome/common/extensions/api",

@ -15,6 +15,7 @@ static_library("utility") {
sources = rebase_path(gypi_values.chrome_utility_sources, ".", "..")
defines = []
public_deps = []
deps = [
"//base",
"//components/strings",
@ -40,7 +41,7 @@ static_library("utility") {
#"//third_party/libexif", TODO(GYP)
]
forward_dependent_configs_from = [
public_deps += [
"//chrome/common/extensions/api",
]

@ -36,6 +36,9 @@ static_library("browser") {
"wallet/wallet_signin_helper.h",
]
public_deps = [
"//skia",
]
deps = [
":risk_proto",
"//base",
@ -54,7 +57,6 @@ static_library("browser") {
"//content/public/common",
"//google_apis",
"//ipc",
"//skia",
"//sql",
"//third_party/icu",
"//third_party/libphonenumber",
@ -64,10 +66,6 @@ static_library("browser") {
"//ui/gfx/geometry",
"//url",
]
forward_dependent_configs_from = [
"//skia",
]
}
proto_library("risk_proto") {

@ -156,7 +156,7 @@ static_library("browser") {
"//url",
]
direct_dependent_configs = [ ":autofill_browser_config" ]
public_configs = [ ":autofill_browser_config" ]
if (autofill_enable_sync) {
deps += [ "//sync" ]

@ -33,6 +33,6 @@ source_set("browser") {
if (is_posix && !is_ios &&
(!is_android || !is_android_webview_build)) {
configs += [ "//breakpad:client_config" ]
direct_dependent_configs = [ "//breakpad:client_config" ]
public_configs = [ "//breakpad:client_config" ]
}
}

@ -14,8 +14,10 @@ if (!is_ios) {
"web_contents_main_frame_observer.h",
]
deps = [
public_deps = [
"//components/dom_distiller/core",
]
deps = [
"//components/resources",
"//components/strings",
"//content/public/browser",
@ -23,9 +25,5 @@ if (!is_ios) {
"//skia",
"//sync",
]
forward_dependent_configs_from = [
"//components/dom_distiller/core",
]
}
}

@ -46,25 +46,22 @@ static_library("core") {
"viewer.h",
]
public_deps = [
"//components/dom_distiller/core/proto",
"//third_party/dom_distiller_js:proto",
]
deps = [
"//base",
"//components/dom_distiller/core/proto",
"//components/leveldb_proto",
"//components/resources",
"//components/strings",
"//net",
"//skia",
"//sync",
"//third_party/dom_distiller_js:proto",
"//ui/base",
"//url",
]
forward_dependent_configs_from = [
"//components/dom_distiller/core/proto",
"//third_party/dom_distiller_js:proto",
]
if (is_android) {
deps += [ ":jni_headers" ]
}

@ -19,13 +19,12 @@ static_library("core") {
"infobars_switches.h",
]
public_deps = [
"//skia",
]
deps = [
"//base",
"//skia",
"//ui/gfx",
"//ui/strings",
]
# This target exposes Skia headers in its public headers.
forward_dependent_configs_from = [ "//skia" ]
}

@ -76,6 +76,9 @@ static_library("invalidation") {
]
}
public_deps = [
"//third_party/cacheinvalidation",
]
deps = [
"//base",
"//components/gcm_driver",
@ -84,16 +87,11 @@ static_library("invalidation") {
"//components/signin/core/browser",
"//google_apis",
"//jingle:notifier",
"//third_party/cacheinvalidation",
# TODO(sync): Remove this (http://crbug.com/133352);
"//third_party/protobuf:protobuf_lite",
# "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
]
forward_dependent_configs_from = [
"//third_party/cacheinvalidation",
]
}
static_library("test_support") {

@ -44,14 +44,14 @@ source_set("metrics") {
"persisted_logs.h",
]
public_deps = [
"//components/metrics/proto",
]
deps = [
"//base",
"//components/metrics/proto",
"//components/variations",
"//third_party/zlib",
]
forward_dependent_configs_from = [ "//components/metrics/proto" ]
}
# GYP version: components/metrics.gypi:metrics_gpu
@ -61,12 +61,12 @@ source_set("gpu") {
"gpu/gpu_metrics_provider.h",
]
deps = [
public_deps = [
":metrics",
]
deps = [
"//gpu/config",
]
forward_dependent_configs_from = [ ":metrics" ]
}
# GYP version: components/metrics.gypi:metrics_net
@ -82,12 +82,12 @@ static_library("net") {
"net/wifi_access_point_info_provider_chromeos.h",
]
deps = [
public_deps = [
":metrics",
]
deps = [
"//net",
]
forward_dependent_configs_from = [ ":metrics" ]
}
# GYP version: components/metrics.gypi:metrics_profiler
@ -100,13 +100,13 @@ source_set("profiler") {
"profiler/tracking_synchronizer_observer.h",
]
deps = [
public_deps = [
":metrics",
]
deps = [
"//base",
"//content/public/browser",
]
forward_dependent_configs_from = [ ":metrics" ]
}
# GYP version: components/metrics.gypi:metrics_test_support
@ -116,11 +116,9 @@ static_library("test_support") {
"test_metrics_service_client.h",
]
deps = [
public_deps = [
":metrics",
]
forward_dependent_configs_from = [ ":metrics" ]
}
# TODO(GYP): metrics_chromeos

@ -35,9 +35,11 @@ static_library("omnibox") {
"url_prefix.h",
]
public_deps = [
"//components/metrics/proto",
]
deps = [
"//base",
"//components/metrics/proto",
"//components/resources",
"//components/search_engines",
"//components/strings",
@ -47,10 +49,6 @@ static_library("omnibox") {
"//ui/base",
"//url",
]
forward_dependent_configs_from = [
"//components/metrics/proto",
]
}
static_library("test_support") {

@ -79,7 +79,7 @@ static_library("browser") {
cflags = [ "/wd4267" ]
}
direct_dependent_configs = [ ":password_manager_config" ]
public_configs = [ ":password_manager_config" ]
# Sync (not supported in Android WebView).
if (!is_android || !is_android_webview_build) {
@ -106,15 +106,13 @@ source_set("test_support") {
"test_password_store.h",
]
deps = [
public_deps = [
":browser",
]
deps = [
"//base",
"//components/autofill/core/common",
"//testing/gmock",
"//testing/gtest",
]
forward_dependent_configs_from = [
":browser",
]
}

@ -53,10 +53,9 @@ if (enable_plugins) {
if (is_component_build) {
shared_library("content") {
deps = content_shared_components + [
public_deps = content_shared_components + [
"//content/public/app:both_sources",
]
forward_dependent_configs_from = deps
}
} else {
group("content") {

@ -15,21 +15,19 @@ source_set("common") {
sources = rebase_path(content_common_gypi_values.private_common_sources,
".", "//content")
forward_dependent_configs_from = [
"//gpu/command_buffer/common",
"//third_party/WebKit/public:blink_headers",
]
configs += [
"//content:content_implementation",
]
public_deps = [
"//gpu/command_buffer/common",
"//third_party/WebKit/public:blink_headers",
]
deps = [
"//base",
"//build/util:webkit_version",
"//components/tracing",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/common",
"//net",
"//skia",
"//third_party/icu",
@ -40,7 +38,6 @@ source_set("common") {
"//ui/gfx/ipc",
"//ui/shell_dialogs",
"//url",
"//third_party/WebKit/public:blink_headers",
"//third_party/libjingle",
]

@ -8,11 +8,10 @@ import("//build/config/ui.gni")
# See //content/BUILD.gn for how this works.
group("browser") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":browser_sources" ]
public_deps = [ ":browser_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("browser_sources") {
@ -41,11 +40,14 @@ source_set("browser_sources") {
configs += [ "//content:content_implementation" ]
public_deps = [
# We expose skia headers in the public API.
"//skia",
]
deps = [
"//content/browser",
"//content/public/common:common_sources",
"//net",
"//skia",
"//ui/accessibility",
"//ui/base",
"//ui/events",
@ -56,7 +58,4 @@ source_set("browser_sources") {
# include headers from each other.
"//content/browser",
]
# We expose skia headers in the public API.
forward_dependent_configs_from = [ "//skia" ]
}

@ -7,11 +7,10 @@ import("//content/child/child.gni")
# See //content/BUILD.gn for how this works.
group("child") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":child_sources" ]
public_deps = [ ":child_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("child_sources") {

@ -8,11 +8,10 @@ import("//content/common/common.gni")
# See //content/BUILD.gn for how this works.
group("common") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":common_sources" ]
public_deps = [ ":common_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("common_sources") {
@ -25,8 +24,10 @@ source_set("common_sources") {
"//content:content_implementation",
]
deps = [
public_deps = [
"//content/common",
]
deps = [
"//net",
"//skia",
"//third_party/WebKit/public:blink_headers",
@ -35,8 +36,6 @@ source_set("common_sources") {
"//ui/gfx",
]
forward_dependent_configs_from = [ "//content/common" ]
if (!enable_plugins) {
sources -= [
"pepper_plugin_info.cc",

@ -5,11 +5,10 @@
# See //content/BUILD.gn for how this works.
group("plugin") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":plugin_sources" ]
public_deps = [ ":plugin_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("plugin_sources") {

@ -8,11 +8,10 @@ import("//content/renderer/renderer.gni")
# See //content/BUILD.gn for how this works.
group("renderer") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":renderer_sources" ]
public_deps = [ ":renderer_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("renderer_sources") {

@ -5,11 +5,10 @@
# See //content/BUILD.gn for how this works.
group("utility") {
if (is_component_build) {
deps = [ "//content" ]
public_deps = [ "//content" ]
} else {
deps = [ ":utility_sources" ]
public_deps = [ ":utility_sources" ]
}
forward_dependent_configs_from = deps
}
source_set("utility_sources") {

@ -343,8 +343,7 @@ copy("copy_shell_resources") {
sources = [ "$target_gen_dir/shell_resources.pak" ]
outputs = [ "$root_out_dir/shell_resources.pak" ]
deps = [ ":content_shell_resources_grit" ]
forward_dependent_configs_from = [ ":content_shell_resources_grit" ]
public_deps = [ ":content_shell_resources_grit" ]
}
# Font copies.
@ -378,10 +377,10 @@ if (is_android) {
}
group("resources") {
deps = [
public_deps = [
":copy_shell_resources",
]
forward_dependent_configs_from = [ ":copy_shell_resources" ]
deps = []
if (is_mac) {
# TODO(GYP) Mac bundle resources.

@ -15,6 +15,7 @@ content_tests_gypi_values = exec_script(
# GYP version //content/content_tests.gypi:test_support_content
static_library("test_support") {
testonly = true
public_deps = []
deps = [
"//cc/blink",
"//content/public/app:both",
@ -42,6 +43,9 @@ static_library("test_support") {
sources = rebase_path(content_tests_gypi_values.test_support_content_sources,
".", "//content")
public_deps += [
"//third_party/WebKit/public:blink",
]
deps += [
"//content/browser/speech/proto",
"//content/public/child:child_sources",
@ -58,16 +62,11 @@ static_library("test_support") {
"//ppapi:ppapi_unittest_shared",
"//storage/browser",
"//storage/common",
"//third_party/WebKit/public:blink",
"//ui/surface",
"//v8",
"//webkit/common/gpu",
]
forward_dependent_configs_from = [
"//third_party/WebKit/public:blink",
]
if (enable_plugins) {
deps += [ "//content/ppapi_plugin" ]
}

@ -285,11 +285,11 @@ group("platform") {
#
# We always need our SSL header search path to come before the system one
# so our versions are used. The libssl target will add the search path we
# want, but according to GN's ordering rules, direct_dependent_configs'
# search path will get applied before ones inherited from our
# dependencies. Therefore, we need to explicitly list our custom libssl's
# config here before the system one.
direct_dependent_configs = [
# want, but according to GN's ordering rules, public_configs' search path
# will get applied before ones inherited from our dependencies.
# Therefore, we need to explicitly list our custom libssl's config here
# before the system one.
public_configs = [
"//net/third_party/nss/ssl:ssl_config",
"//third_party/nss:system_nss_no_ssl_config",
]

@ -43,7 +43,7 @@ component("dbus") {
"//third_party/protobuf:protobuf_lite",
]
direct_dependent_configs = [
public_configs = [
"//build/config/linux:dbus",
]
}

@ -27,9 +27,8 @@ static_library("media_transfer_protocol") {
configs += [ "//build/config/linux:dbus" ]
deps = [
public_deps = [
":mtp_file_entry_proto",
":mtp_storage_info_proto",
]
forward_dependent_configs_from = deps
}

@ -197,7 +197,7 @@ template("generated_extensions_api") {
if (defined(invoker.deps)) {
deps += invoker.deps
}
direct_dependent_configs = [ ":$generated_config_name" ]
public_configs = [ ":$generated_config_name" ]
if (defined(invoker.visibility)) {
visibility = invoker.visibility

@ -58,15 +58,13 @@ component("gin") {
]
defines = [ "GIN_IMPLEMENTATION" ]
deps = [
public_deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//v8",
]
forward_dependent_configs_from = [
"//base",
"//v8",
deps = [
"//base/third_party/dynamic_annotations",
]
}
@ -98,15 +96,12 @@ source_set("gin_test") {
"test/v8_test.h",
]
deps = [
public_deps = [
":gin",
"//testing/gtest",
"//v8",
]
forward_dependent_configs_from = [
":gin",
"//testing/gtest",
deps = [
"//v8",
]
}

@ -182,13 +182,12 @@ source_set("test_support") {
"gaia/oauth2_token_service_test_util.h",
]
deps = [
public_deps = [
"//base",
"//base/test:test_support",
"//net",
"//net:test_support",
]
forward_dependent_configs_from = deps
if (enable_extensions) {
sources += [

@ -45,16 +45,16 @@ component("gcm") {
defines = [ "GCM_IMPLEMENTATION" ]
deps = [
public_deps = [
":proto",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//net",
"//third_party/leveldatabase",
"//url",
]
forward_dependent_configs_from = [ ":proto" ]
}
proto_library("proto") {
@ -83,13 +83,13 @@ static_library("test_support") {
"monitoring/fake_gcm_stats_recorder.h",
]
deps = [
public_deps = [
":gcm",
]
deps = [
"//base",
"//testing/gtest",
]
forward_dependent_configs_from = [ ":gcm" ]
}
# A standalone MCS (mobile connection server) client.

@ -99,7 +99,7 @@ gles2_implementation_source_files = [
# an implementation.
source_set("gles2_interface") {
sources = [ "gles2_interface.h" ]
direct_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
public_configs = [ "//third_party/khronos:khronos_headers" ]
deps = [
"//base",
]

@ -13,13 +13,14 @@ if (enable_webrtc || !is_android) {
# GYP version: jingle/jingle.gyp:jingle_glue
static_library("jingle_glue") {
sources = jingle_includes.jingle_glue_sources
public_deps = [
"//third_party/libjingle",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//net",
"//third_party/libjingle",
]
forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
# A library for sending and receiving peer-issued notifications.
@ -77,15 +78,17 @@ if (enable_webrtc || !is_android) {
defines = [
"_CRT_SECURE_NO_WARNINGS",
]
public_deps = [
"//third_party/libjingle",
]
deps = [
"//base",
"//net",
"//third_party/expat",
"//url",
":jingle_glue",
"//third_party/libjingle",
]
forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
# GYP version: jingle/jingle.gyp:notifier_test_util
@ -148,6 +151,9 @@ if (enable_webrtc || !is_android) {
]
}
public_deps = [
"//third_party/libjingle",
]
deps = [
":jingle_glue",
":notifier",
@ -159,9 +165,7 @@ if (enable_webrtc || !is_android) {
"//net:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/libjingle",
]
forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
} else {
# !enable_webrtc and is_android

@ -45,16 +45,14 @@ source_set("common") {
"logging/stats_event_subscriber.h",
]
public_deps = [
"//media/cast/logging/proto",
]
deps = [
"//base",
"//crypto",
"//media/cast/logging/proto",
"//net",
]
forward_dependent_configs_from = [
"//media/cast/logging/proto",
]
}
source_set("net") {

@ -9,10 +9,7 @@ source_set("proto") {
sources = [
"proto_utils.cc",
]
deps = [
":cast_logging_proto",
]
forward_dependent_configs_from = [
public_deps = [
":cast_logging_proto",
]
}

@ -6,15 +6,12 @@ import("//third_party/protobuf/proto_library.gni")
# GYP version: media/cast/cast.gyp:cast_logging_proto
source_set("proto") {
deps = [
public_deps = [
":cast_network_simulation_proto",
]
direct_dependent_configs = [
public_configs = [
"//third_party/protobuf:protobuf_config"
]
forward_dependent_configs_from = [
":cast_network_simulation_proto",
]
}
proto_library("cast_network_simulation_proto") {

@ -16,6 +16,9 @@ source_set("aura") {
"window_tree_host_mojo_delegate.h",
]
public_deps = [
"//mojo/services/public/cpp/view_manager",
]
deps = [
"//cc",
"//skia",
@ -26,11 +29,6 @@ source_set("aura") {
"//ui/gl",
"//mojo/cc",
"//mojo/public/gles2:for_shared_library",
"//mojo/services/public/cpp/view_manager",
"//mojo/services/public/interfaces/native_viewport",
]
forward_dependent_configs_from = [
"//mojo/services/public/cpp/view_manager",
]
}

@ -16,12 +16,10 @@ source_set("js") {
"waiting_callback.h",
]
deps = [
public_deps = [
"//base",
"//gin",
"//mojo/common",
"//v8",
]
forward_dependent_configs_from = deps
}

@ -13,11 +13,7 @@ source_set("chromium") {
"../public/cpp/environment/lib/logging.cc",
]
deps = [
":chromium_impl",
]
forward_dependent_configs_from = [
public_deps = [
":chromium_impl",
]
}

@ -39,7 +39,7 @@ component("gles2") {
":gles2_use_mojo",
":mojo_use_gles2",
]
direct_dependent_configs = [ ":gles2_use_mojo" ]
public_configs = [ ":gles2_use_mojo" ]
all_dependent_configs = [ ":mojo_use_gles2" ]
sources = [

@ -16,7 +16,7 @@ static_library("gles2") {
":gles2_config",
"//third_party/khronos:khronos_headers",
]
direct_dependent_configs = [
public_configs = [
":gles2_config",
"//third_party/khronos:khronos_headers",
]

@ -6,17 +6,17 @@
component("geometry") {
output_name = "mojo_geometry_lib"
public_deps = [
"//ui/gfx",
]
deps = [
"//skia",
"//ui/gfx",
"//ui/gfx/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system:for_component",
"//mojo/services/public/interfaces/geometry",
]
forward_dependent_configs_from = [ "//ui/gfx" ]
defines = [
"MOJO_GEOMETRY_IMPLEMENTATION",
]

@ -84,27 +84,25 @@ component("net") {
"NET_IMPLEMENTATION"
]
configs += [ ":net_win_size_truncation" ]
direct_dependent_configs = [ ":net_config" ]
public_configs = [ ":net_config" ]
include_dirs = []
public_deps = [
"//crypto",
"//crypto:platform"
]
deps = [
":net_resources",
"//base",
"//base:i18n",
"//base:prefs",
"//base/third_party/dynamic_annotations",
"//crypto",
"//crypto:platform",
"//net/base/registry_controlled_domains",
"//sdch",
"//third_party/icu",
"//third_party/zlib",
"//url",
]
forward_dependent_configs_from = [
"//crypto",
"//crypto:platform"
]
if (use_kerberos) {
defines += [ "USE_KERBEROS" ]
@ -697,7 +695,7 @@ source_set("test_support") {
configs += [ ":net_win_size_truncation" ]
deps = [
public_deps = [
"//base",
"//base/test:test_support",
"//crypto",
@ -709,7 +707,7 @@ source_set("test_support") {
]
if (is_ios) {
deps += [ "//third_party/nss" ]
public_deps += [ "//third_party/nss" ]
}
if (!is_android) {
@ -722,7 +720,7 @@ source_set("test_support") {
}
if (use_v8_in_net) {
deps += [ ":net_with_v8" ]
public_deps += [ ":net_with_v8" ]
}
if (!enable_mdns) {
@ -733,14 +731,12 @@ source_set("test_support") {
}
if (use_nss_certs) {
deps += ["//crypto:platform" ]
public_deps += ["//crypto:platform" ]
} else {
sources -= [
"test/cert_test_util_nss.cc",
]
}
forward_dependent_configs_from = deps
}
source_set("balsa") {
@ -788,15 +784,15 @@ if (use_v8_in_net) {
"//build/config/compiler:wexit_time_destructors",
]
deps = [
public_deps = [
":net",
]
deps = [
"//base",
"//gin",
"//url",
"//v8",
]
forward_dependent_configs_from = [ ":net" ]
}
}

@ -57,7 +57,7 @@ component("libssl") {
"bodge/secitem_array.c",
]
direct_dependent_configs = [ ":ssl_config" ]
public_configs = [ ":ssl_config" ]
cflags = []
defines = [
@ -88,7 +88,7 @@ component("libssl") {
# Must be after ssl_config since we want our SSL headers to take
# precedence.
direct_dependent_configs += [
public_configs += [
"//third_party/nss:system_nss_no_ssl_config"
]
} else if (is_mac) {
@ -114,11 +114,10 @@ component("libssl") {
sources -= [
"bodge/secitem_array.c",
]
deps = [
public_deps = [
"//third_party/nss:nspr",
"//third_party/nss:nss",
]
forward_dependent_configs_from = deps
}
if (is_clang) {

@ -408,6 +408,9 @@ component("ppapi_shared") {
"PPAPI_THUNK_IMPLEMENTATION",
]
public_deps = [
blink_target,
]
deps = [
":ppapi_c",
"//base",
@ -429,9 +432,6 @@ component("ppapi_shared") {
} else if (is_win) {
cflags = [ "/wd4267" ] # size_t to int truncation.
}
deps += [ blink_target ]
forward_dependent_configs_from = [ blink_target ]
}
source_set("ppapi_ipc") {

@ -67,29 +67,25 @@ static_library("base") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [
public_deps = [
"//base",
"//net",
"//remoting/proto",
"//third_party/protobuf:protobuf_lite",
]
deps = [
"//base/third_party/dynamic_annotations",
"//media",
"//media:shared_memory_support",
"//net",
"//remoting/proto",
"//remoting/resources",
#"//third_party/libvpx", TODO(GYP)
"//third_party/libyuv",
"//third_party/opus",
"//third_party/protobuf:protobuf_lite",
"//third_party/webrtc/modules/desktop_capture",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
]
forward_dependent_configs_from = [
"//base",
"//net",
"//remoting/proto",
"//third_party/protobuf:protobuf_lite",
]
}

@ -139,6 +139,9 @@ static_library("protocol") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
public_deps = [
"//third_party/libjingle",
]
deps = [
"//base",
"//crypto",
@ -146,10 +149,5 @@ static_library("protocol") {
"//jingle:notifier",
"//net",
"//remoting/base",
"//third_party/libjingle",
]
forward_dependent_configs_from = [
"//third_party/libjingle",
]
}

@ -53,7 +53,7 @@ source_set("rlz_lib") {
"win/lib/rlz_value_store_registry.h",
]
direct_dependent_configs = [ ":rlz_config" ]
public_configs = [ ":rlz_config" ]
deps = [
"//base",

@ -38,7 +38,7 @@ static_library("sdch") {
"open-vcdiff/vsprojects/stdint.h",
]
direct_dependent_configs = [ ":sdch_config" ]
public_configs = [ ":sdch_config" ]
deps = [
"//base",

@ -508,7 +508,7 @@ component("skia") {
":skia_library_config",
"//build/config/compiler:no_chromium_code"
]
direct_dependent_configs = [ ":skia_config" ]
public_configs = [ ":skia_config" ]
deps = [
":skia_opts",

@ -472,7 +472,7 @@ static_library("test_support_sync_core") {
"util/test_unrecoverable_error_handler.h",
]
deps = [
public_deps = [
"//base",
"//testing/gmock",
"//testing/gtest",
@ -481,12 +481,6 @@ static_library("test_support_sync_core") {
defines = [ "SYNC_TEST" ]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
forward_dependent_configs_from = [
"//testing/gmock",
"//testing/gtest",
"//sync"
]
}
# GYP version: sync/sync_tests.gypi:test_support_sync_internal_api
@ -509,7 +503,7 @@ static_library("test_support_sync_internal_api") {
"internal_api/test/test_user_share.cc",
]
deps = [
public_deps = [
"//base",
"//testing/gtest",
"//sync",
@ -518,12 +512,6 @@ static_library("test_support_sync_internal_api") {
defines = [ "SYNC_TEST" ]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
forward_dependent_configs_from = [
"//testing/gtest",
"//sync",
":test_support_sync_core",
]
}
# GYP version: sync/sync_tests.gypi:test_support_sync_api
@ -540,14 +528,9 @@ static_library("test_support_sync_api") {
"api/sync_error_factory_mock.h",
]
deps = [
"//testing/gmock",
"//sync",
]
defines = [ "SYNC_TEST" ]
forward_dependent_configs_from = [
public_deps = [
"//testing/gmock",
"//sync",
]
@ -720,16 +703,16 @@ static_library("test_support_sync_testserver") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [
public_deps = [
"//base",
"//net:test_support",
]
deps = [
":sync",
# The sync test server uses Python modules generated by the sync protos.
# '../third_party/protobuf/protobuf.gyp:py_proto', # TODO(GYP)
]
forward_dependent_configs_from = [ "//base", "//net:test_support" ]
}
# GYP version: sync/sync_tests.gypi:test_support_accounts_client

@ -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" ]
}

@ -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 = [

@ -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",
]
}

@ -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") {

@ -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) {

@ -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.

@ -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" ]
}

@ -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",

@ -12,6 +12,6 @@ source_set("iccjpeg") {
"iccjpeg.h"
]
direct_dependent_configs = [ ":iccjpeg_config" ]
public_configs = [ ":iccjpeg_config" ]
deps = [ "//third_party:jpeg" ]
}

@ -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",

@ -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",

@ -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

@ -75,5 +75,5 @@ source_set("libjpeg") {
"//build/config/compiler:no_chromium_code",
]
direct_dependent_configs = [ ":libjpeg_config" ]
public_configs = [ ":libjpeg_config" ]
}

@ -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

@ -64,7 +64,7 @@ source_set("libpng_sources") {
}
}
direct_dependent_configs = [ ":libpng_config" ]
public_configs = [ ":libpng_config" ]
public_deps = [ "//third_party/zlib" ]
}

@ -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 = [

@ -193,7 +193,7 @@ group("libwebp") {
":libwebp_enc",
":libwebp_utils",
]
direct_dependent_configs = [
public_configs = [
":libwebp_config"
]
if (use_dsp_neon) {

@ -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",
]

@ -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" ]

@ -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" ]
}

@ -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

@ -20,5 +20,5 @@ source_set("npapi") {
"bindings/npruntime.h",
]
direct_dependent_configs = [ ":npapi_config" ]
public_configs = [ ":npapi_config" ]
}

@ -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 += [

@ -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
}

@ -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" ]
deps = [
":$action_name",
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",
]
# 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" ]
deps = [
":$action_name",
]
}
}

@ -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" ]

@ -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",

Some files were not shown because too many files have changed in this diff Show More