diff options
Diffstat (limited to 'src/main/java')
4 files changed, 0 insertions, 86 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java index ec5c05564f..8d8235dc54 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; // final as well as intermediate artifacts. public final class IntermediateArtifacts { static final String LINKMAP_SUFFIX = ".linkmap"; - static final String BREAKPAD_SUFFIX = ".breakpad"; /** * Extension used for the zip archive containing dsym files and their associated plist. Note that @@ -356,20 +355,6 @@ public final class IntermediateArtifacts { } /** - * Breakpad debug symbol representation. - */ - public Artifact breakpadSym() { - return appendExtension(BREAKPAD_SUFFIX); - } - - /** - * Breakpad debug symbol representation for a specific architecture. - */ - public Artifact breakpadSym(String arch) { - return architectureRepresentation(arch, BREAKPAD_SUFFIX); - } - - /** * Linkmap representation */ public Artifact linkmap() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java index fa2df6aab9..ce08f4e05e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java @@ -281,13 +281,6 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive new Key<>(STABLE_ORDER, "exported_debug_artifacts", Artifact.class); /** - * Generated breakpad file containing debug information used by the breakpad crash reporting - * system. - */ - public static final Key<Artifact> BREAKPAD_FILE = - new Key<>(STABLE_ORDER, "breakpad_file", Artifact.class); - - /** * Single-architecture link map for a binary. */ public static final Key<Artifact> LINKMAP_FILE = @@ -375,7 +368,6 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive DYNAMIC_FRAMEWORK_FILE, DEBUG_SYMBOLS, DEBUG_SYMBOLS_PLIST, - BREAKPAD_FILE, STORYBOARD, XIB, STRINGS, diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java index fccb4c0b55..db34c77f8e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java @@ -852,11 +852,6 @@ public class ObjcRuleClasses { public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder .add( - attr("$dumpsyms", LABEL) - .cfg(HOST) - .singleArtifact() - .value(env.getToolsLabel("//tools/osx/crosstool:dump_syms"))) - .add( attr("$j2objc_dead_code_pruner", LABEL) .allowedFileTypes(FileType.of(".py")) .cfg(HOST) 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 eae1193ed3..6af884554f 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 @@ -295,7 +295,6 @@ public final class ReleaseBundlingSupport { bundleSupport.registerActions(objcProvider); registerCombineArchitecturesAction(); - registerTransformAndCopyBreakpadFilesAction(); registerCopyDsymFilesAction(dsymOutputType); registerCopyDsymPlistAction(dsymOutputType); registerCopyLinkmapFilesAction(); @@ -889,46 +888,6 @@ public final class ReleaseBundlingSupport { .build(ruleContext)); } - /** - * Registers the actions that transform and copy the breakpad files from the CPU-specific binaries - * that are part of this application. There are two steps involved: 1) The breakpad files have to - * be renamed to include their corresponding CPU architecture as a suffix. 2) The first line of - * the breakpad file has to be rewritten, as it has to include the name of the application instead - * of the name of the binary artifact. - * - * <p>Example:<br> - * The ios_application "PrenotCalculator" is specified to use "PrenotCalculatorBinary" as its - * binary. Assuming that the application is built for armv7 and arm64 CPUs, in the build process - * two binaries with a corresponding breakpad file each will be built: - * - * <pre>blaze-out/xyz-crosstool-ios-arm64/.../PrenotCalculatorBinary_bin - * blaze-out/xyz-crosstool-ios-arm64/.../PrenotCalculatorBinary.breakpad - * blaze-out/xyz-crosstool-ios-armv7/.../PrenotCalculatorBinary_bin - * blaze-out/xyz-crosstool-ios-armv7/.../PrenotCalculatorBinary.breakpad</pre> - * - * <p>The first line of the breakpad files will look like this: - * <pre>MODULE mac arm64 8A7A2DDD28E83E27B339E63631ADBEF30 PrenotCalculatorBinary_bin</pre> - * - * <p>For our application, we have to transform & copy these breakpad files like this: - * <pre>$ head -n1 blaze-bin/.../PrenotCalculator_arm64.breakpad - * MODULE mac arm64 8A7A2DDD28E83E27B339E63631ADBEF30 PrenotCalculator</pre> - */ - private void registerTransformAndCopyBreakpadFilesAction() { - for (Entry<Artifact, Artifact> breakpadFiles : getBreakpadFiles().entrySet()) { - ruleContext.registerAction( - new SpawnAction.Builder().setMnemonic("CopyBreakpadFile") - .setShellCommand(String.format( - // This sed command replaces the last word of the first line with the application - // name. - "sed \"1 s/^\\(MODULE \\w* \\w* \\w*\\).*$/\\1 %s/\" < %s > %s", - ruleContext.getLabel().getName(), breakpadFiles.getKey().getExecPathString(), - breakpadFiles.getValue().getExecPathString())) - .addInput(breakpadFiles.getKey()) - .addOutput(breakpadFiles.getValue()) - .build(ruleContext)); - } - } - private void registerCopyLinkmapFilesAction() { for (Entry<Artifact, Artifact> linkmapFile : getLinkmapFiles().entrySet()) { ruleContext.registerAction( @@ -974,19 +933,6 @@ public final class ReleaseBundlingSupport { } /** - * Returns a map of input breakpad artifacts from the CPU-specific binaries built for this - * ios_application to the new output breakpad artifacts. - */ - private ImmutableMap<Artifact, Artifact> getBreakpadFiles() { - ImmutableMap.Builder<Artifact, Artifact> results = ImmutableMap.builder(); - for (Entry<String, Artifact> breakpadFile : attributes.cpuSpecificBreakpadFiles().entrySet()) { - Artifact destBreakpad = intermediateArtifacts.breakpadSym(breakpadFile.getKey()); - results.put(breakpadFile.getValue(), destBreakpad); - } - return results.build(); - } - - /** * Returns a map of input dsym artifacts from the CPU-specific binaries built for this * ios_application to the new output dsym artifacts. * @@ -1277,10 +1223,6 @@ public final class ReleaseBundlingSupport { return ruleContext.getPrerequisiteArtifact(DEBUG_ENTITLEMENTS_ATTR, Mode.HOST); } - ImmutableMap<String, Artifact> cpuSpecificBreakpadFiles() { - return cpuSpecificArtifacts(ObjcProvider.BREAKPAD_FILE); - } - ImmutableMap<String, Artifact> cpuSpecificDsymFiles() { return cpuSpecificArtifacts(ObjcProvider.DEBUG_SYMBOLS); } |