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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/config/ios/rules.gni

Issue 2437593005: Fix compilation of uber-fat binaries. (Closed)
Patch Set: Fix typo in native_client_sdk/PRESUBMIT.py Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/ios/ios_sdk.gni ('k') | native_client_sdk/PRESUBMIT.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ios/rules.gni
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index 93565f065b2b5a92626395dac3ce8fc640bebb48..f2634569cce4cd62be8a39dd43f536338dae4593 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -398,7 +398,7 @@ template("ios_app_bundle") {
visibility = [ ":$_arch_executable_target" ]
}
- if (use_ios_simulator) {
+ if (current_toolchain == default_toolchain || use_ios_simulator) {
_generate_entitlements_target = _target_name + "_gen_entitlements"
_generate_entitlements_output =
get_label_info(":$_generate_entitlements_target($default_toolchain)",
@@ -522,7 +522,7 @@ template("ios_app_bundle") {
executable_name = _output_name
}
- if (use_ios_simulator) {
+ if (current_toolchain == default_toolchain) {
_entitlements_path = "//build/config/ios/entitlements.plist"
if (defined(invoker.entitlements_path)) {
_entitlements_path = invoker.entitlements_path
« no previous file with comments | « build/config/ios/ios_sdk.gni ('k') | native_client_sdk/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698