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

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

Issue 2233663002: Fix the location of resources in iOS frameworks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 8
9 _is_secondary_build = 9 _is_secondary_build =
10 additional_toolchains != [] && current_toolchain != default_toolchain 10 additional_toolchains != [] && current_toolchain != default_toolchain
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 deps += [ ":$_info_plist_bundle" ] 1132 deps += [ ":$_info_plist_bundle" ]
1133 1133
1134 if (defined(invoker.bundle_deps)) { 1134 if (defined(invoker.bundle_deps)) {
1135 if (!defined(deps)) { 1135 if (!defined(deps)) {
1136 deps = [] 1136 deps = []
1137 } 1137 }
1138 deps += invoker.bundle_deps 1138 deps += invoker.bundle_deps
1139 } 1139 }
1140 1140
1141 bundle_root_dir = _framework_root_dir 1141 bundle_root_dir = _framework_root_dir
1142 bundle_resources_dir = "$bundle_root_dir/Resources" 1142 bundle_resources_dir = _framework_root_dir
1143 bundle_executable_dir = "$bundle_root_dir" 1143 bundle_executable_dir = _framework_root_dir
1144 1144
1145 if (!defined(deps)) { 1145 if (!defined(deps)) {
1146 deps = [] 1146 deps = []
1147 } 1147 }
1148 deps += [ ":$_lipo_shared_library_target" ] 1148 deps += [ ":$_lipo_shared_library_target" ]
1149 1149
1150 _entitlements_path = _default_entitlements_path 1150 _entitlements_path = _default_entitlements_path
1151 if (defined(invoker.entitlements_path)) { 1151 if (defined(invoker.entitlements_path)) {
1152 _entitlements_path = invoker.entitlements_path 1152 _entitlements_path = invoker.entitlements_path
1153 } 1153 }
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 "-rpath", 1470 "-rpath",
1471 "-Xlinker", 1471 "-Xlinker",
1472 "@loader_path/Frameworks", 1472 "@loader_path/Frameworks",
1473 ] 1473 ]
1474 } 1474 }
1475 } 1475 }
1476 1476
1477 set_defaults("ios_xctest_test") { 1477 set_defaults("ios_xctest_test") {
1478 configs = default_executable_configs 1478 configs = default_executable_configs
1479 } 1479 }
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