Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: build/config/ios/rules.gni

Issue 2778813002: [ios] Add framework_dir flag to all_dependent_configs (-F). (Closed)
Patch Set: Rebase on origin/master. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ios/ios_sdk.gni") 5 import("//build/config/ios/ios_sdk.gni")
6 import("//build/config/mac/base_rules.gni") 6 import("//build/config/mac/base_rules.gni")
7 import("//build/config/mac/symbols.gni") 7 import("//build/config/mac/symbols.gni")
8 import("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 9
10 # Invokes lipo on multiple arch-specific binaries to create a fat binary. 10 # Invokes lipo on multiple arch-specific binaries to create a fat binary.
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 forward_variables_from(invoker, 1139 forward_variables_from(invoker,
1140 [ 1140 [
1141 "public_configs", 1141 "public_configs",
1142 "visibility", 1142 "visibility",
1143 "testonly", 1143 "testonly",
1144 ]) 1144 ])
1145 public_deps = [ 1145 public_deps = [
1146 ":$_link_target_name($default_toolchain)", 1146 ":$_link_target_name($default_toolchain)",
1147 ] 1147 ]
1148 1148
1149 if (!defined(public_configs)) {
1150 public_configs = []
1151 }
1152 public_configs += [ ":$_framework_public_config" ]
1153 if (_has_public_headers) { 1149 if (_has_public_headers) {
1150 if (!defined(public_configs)) {
1151 public_configs = []
1152 }
1154 public_configs += [ ":$_framework_headers_config" ] 1153 public_configs += [ ":$_framework_headers_config" ]
1155 } 1154 }
1155 if (!defined(all_dependent_configs)) {
1156 all_dependent_configs = []
1157 }
1158 all_dependent_configs += [ ":$_framework_public_config" ]
1156 } 1159 }
1157 1160
1158 if (defined(invoker.bundle_deps)) { 1161 if (defined(invoker.bundle_deps)) {
1159 assert(invoker.bundle_deps != [], "mark bundle_deps as used") 1162 assert(invoker.bundle_deps != [], "mark bundle_deps as used")
1160 } 1163 }
1161 } else { 1164 } else {
1162 if (_has_public_headers) { 1165 if (_has_public_headers) {
1163 _public_headers = invoker.public_headers 1166 _public_headers = invoker.public_headers
1164 _framework_root = "$root_out_dir/$_output_name.framework" 1167 _framework_root = "$root_out_dir/$_output_name.framework"
1165 1168
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 "public_configs", 1293 "public_configs",
1291 "public_deps", 1294 "public_deps",
1292 "testonly", 1295 "testonly",
1293 "visibility", 1296 "visibility",
1294 ]) 1297 ])
1295 if (!defined(public_deps)) { 1298 if (!defined(public_deps)) {
1296 public_deps = [] 1299 public_deps = []
1297 } 1300 }
1298 public_deps += [ ":$_target_name" ] 1301 public_deps += [ ":$_target_name" ]
1299 1302
1300 if (!defined(public_configs)) {
1301 public_configs = []
1302 }
1303 public_configs += [ ":$_framework_public_config" ]
1304 if (_has_public_headers) { 1303 if (_has_public_headers) {
1304 if (!defined(public_configs)) {
1305 public_configs = []
1306 }
1305 public_configs += [ ":$_framework_headers_config" ] 1307 public_configs += [ ":$_framework_headers_config" ]
1306 } 1308 }
1309 if (!defined(all_dependent_configs)) {
1310 all_dependent_configs = []
1311 }
1312 all_dependent_configs += [ ":$_framework_public_config" ]
1307 } 1313 }
1308 1314
1309 bundle_data(_target_name + "+bundle") { 1315 bundle_data(_target_name + "+bundle") {
1310 forward_variables_from(invoker, 1316 forward_variables_from(invoker,
1311 [ 1317 [
1312 "testonly", 1318 "testonly",
1313 "visibility", 1319 "visibility",
1314 ]) 1320 ])
1315 public_deps = [ 1321 public_deps = [
1316 ":$_target_name", 1322 ":$_target_name",
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 "-rpath", 1507 "-rpath",
1502 "-Xlinker", 1508 "-Xlinker",
1503 "@loader_path/Frameworks", 1509 "@loader_path/Frameworks",
1504 ] 1510 ]
1505 } 1511 }
1506 } 1512 }
1507 1513
1508 set_defaults("ios_xctest_test") { 1514 set_defaults("ios_xctest_test") {
1509 configs = default_executable_configs 1515 configs = default_executable_configs
1510 } 1516 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698