diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java index cda2843f8c..0388028d88 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcActionsBuilder.java @@ -81,7 +81,8 @@ final class ObjcActionsBuilder { } private static ByteSource xcodegenControlFileBytes( - final Artifact pbxproj, final XcodeProvider.Project project, final String minimumOs) { + final Artifact pbxproj, final XcodeProvider.Project project, + final ObjcConfiguration objcConfiguration) { return new ByteSource() { @Override public InputStream openStream() { @@ -90,7 +91,11 @@ final class ObjcActionsBuilder { .addAllTarget(project.targets()) .addBuildSetting(XcodeGenProtos.XcodeprojBuildSetting.newBuilder() .setName("IPHONEOS_DEPLOYMENT_TARGET") - .setValue(minimumOs) + .setValue(objcConfiguration.getMinimumOs()) + .build()) + .addBuildSetting(XcodeGenProtos.XcodeprojBuildSetting.newBuilder() + .setName("DEBUG_INFORMATION_FORMAT") + .setValue(objcConfiguration.generateDebugSymbols() ? "dwarf-with-dsym" : "dwarf") .build()) .build() .toByteString() @@ -108,7 +113,7 @@ final class ObjcActionsBuilder { register(new BinaryFileWriteAction( context.getActionOwner(), controlFile, - xcodegenControlFileBytes(pbxproj, project, objcConfiguration.getMinimumOs()), + xcodegenControlFileBytes(pbxproj, project, objcConfiguration), /*makeExecutable=*/false)); register(new SpawnAction.Builder() .setMnemonic("GenerateXcodeproj") |