[ios] Add framework_dir flag to all_dependent_configs (-F).
When building a custom framework, the framework and the framework_dir flags need to be added to the command-line of every linkable target the depends directly or indirectly on it. GN propagates properly the framework as it knows about "libs", but the -F flag added to ldflags need to be propagated using all_dependent_configs. BUG=704946 Review-Url: https://codereview.chromium.org/2778813002 Cr-Original-Commit-Position: refs/heads/master@{#460071} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 5376139411f2b362d24abc27425f3827697a46d4
This commit is contained in:
Родитель
a58c37fd20
Коммит
947f28d085
|
@ -1146,13 +1146,16 @@ template("ios_framework_bundle") {
|
|||
":$_link_target_name($default_toolchain)",
|
||||
]
|
||||
|
||||
if (_has_public_headers) {
|
||||
if (!defined(public_configs)) {
|
||||
public_configs = []
|
||||
}
|
||||
public_configs += [ ":$_framework_public_config" ]
|
||||
if (_has_public_headers) {
|
||||
public_configs += [ ":$_framework_headers_config" ]
|
||||
}
|
||||
if (!defined(all_dependent_configs)) {
|
||||
all_dependent_configs = []
|
||||
}
|
||||
all_dependent_configs += [ ":$_framework_public_config" ]
|
||||
}
|
||||
|
||||
if (defined(invoker.bundle_deps)) {
|
||||
|
@ -1297,13 +1300,16 @@ template("ios_framework_bundle") {
|
|||
}
|
||||
public_deps += [ ":$_target_name" ]
|
||||
|
||||
if (_has_public_headers) {
|
||||
if (!defined(public_configs)) {
|
||||
public_configs = []
|
||||
}
|
||||
public_configs += [ ":$_framework_public_config" ]
|
||||
if (_has_public_headers) {
|
||||
public_configs += [ ":$_framework_headers_config" ]
|
||||
}
|
||||
if (!defined(all_dependent_configs)) {
|
||||
all_dependent_configs = []
|
||||
}
|
||||
all_dependent_configs += [ ":$_framework_public_config" ]
|
||||
}
|
||||
|
||||
bundle_data(_target_name + "+bundle") {
|
||||
|
|
Загрузка…
Ссылка в новой задаче