diff options
| author |  Peter Schmitt <schmitt@google.com> | 2015-03-20 17:59:21 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-03-23 11:55:43 +0000 |
| commit | 5386fa1ef6585948b59daa8e7ab9698a844084c7 (patch) | |
| tree | ac1af81a2a180c5f6307c9e96f8398d18c7a91b9 /src/objc_tools/bundlemerge | |
| parent | 84ec4bfb479abea111acd2343c2602a44c09b3e5 (diff) | |
Remove common java code between objc tools and rules.
As we are releasing the tools somewhat independently of the rules these utility
dependencies make life a lot harder. I'm sad about losing some of the enum
type-safety but being able to treat the code independently is more than worth
it.
--
MOS_MIGRATED_REVID=89137624
Diffstat (limited to 'src/objc_tools/bundlemerge')
| -rw-r--r-- | src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java index 69c00d3f9c..3d3ceaaa44 100644 --- a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java +++ b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java @@ -27,7 +27,6 @@ import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.Contr import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.MergeZip; import com.google.devtools.build.xcode.bundlemerge.proto.BundleMergeProtos.VariableSubstitution; import com.google.devtools.build.xcode.common.Platform; -import com.google.devtools.build.xcode.common.TargetDeviceFamily; import com.google.devtools.build.xcode.plmerge.KeysToRemoveIfEmptyString; import com.google.devtools.build.xcode.plmerge.PlistMerging; import com.google.devtools.build.xcode.zip.ZipFiles; @@ -112,7 +111,7 @@ public final class BundleMerging { PlistMerging plistMerging = PlistMerging.from( sourcePlistFiles, PlistMerging.automaticEntries( - TargetDeviceFamily.fromBundleMergeNames(control.getTargetDeviceFamilyList()), + control.getTargetDeviceFamilyList(), Platform.valueOf(control.getPlatform()), control.getSdkVersion(), control.getMinimumOsVersion()), |