diff options
author | 2015-03-20 20:42:56 +0000 | |
---|---|---|
committer | 2015-03-23 11:57:17 +0000 | |
commit | d8c109f5fdb71482ceab1be4a759b4f67b46ca74 (patch) | |
tree | 5a58b8d126d65428f25c2a97e877d56c3eae41c5 /src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | |
parent | 54b21d4f011f47aee5aa570f292703739f77f1d1 (diff) |
Only use a single copy of a nested bundle with ios_multi_cpus.
We generate a nested bundle for each architecture specified in ios_multi_cpus
which would cause any artifacts generated by these rules (such as info plists
or compiled resource files) to clash in the final application bundle (where
the bundle directory only exists once). For now just pick one architecture at
random to store the bundle in - unfortunately we still generate the bundle for
all architectures.
--
MOS_MIGRATED_REVID=89152199
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java index 76a44ba317..636eac4bab 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java @@ -379,6 +379,8 @@ public final class ReleaseBundlingSupport { return new Bundling.Builder() .setName(ruleContext.getLabel().getName()) + // Architecture that determines which nested bundles are kept. + .setArchitecture(objcConfiguration.getDependencySingleArchitecture()) .setBundleDirFormat(bundleDirFormat) .setExtraBundleFiles(extraBundleFiles) .setObjcProvider(objcProvider) |