Merge pull request #924 from chinmaygarde/master

Avoid generating dSYM files using GN rules.
This commit is contained in:
Chinmay Garde 2015-08-28 12:40:05 -07:00
commit ddbda9e4fc
2 changed files with 19 additions and 25 deletions

View File

@ -61,6 +61,7 @@
9E842EDD1B864EA100C84ECC /* Frameworks */,
9EA9970A1B867E74007B8C62 /* Copy Application + Debugging Symbols */,
9E3A4F5C1B8F82BE00095803 /* Nuke Fake Binary */,
9EB8E2DA1B90DF6F006BFAC2 /* Generate dSYM */,
);
buildRules = (
);
@ -117,6 +118,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "rm ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Harness";
showEnvVarsInLog = 0;
};
9EA9970A1B867E74007B8C62 /* Copy Application + Debugging Symbols */ = {
isa = PBXShellScriptBuildPhase;
@ -130,9 +132,25 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cp -R ${SOURCE_ROOT}/Application/ ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\ncp -R ${SOURCE_ROOT}/Harness.app.dSYM ${BUILT_PRODUCTS_DIR}";
shellScript = "cp -R ${SOURCE_ROOT}/Application/ ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app";
showEnvVarsInLog = 0;
};
9EB8E2DA1B90DF6F006BFAC2 /* Generate dSYM */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Application/",
);
name = "Generate dSYM";
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/Harness.app.dSYM",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "ACTUAL_EXECUTABLE_NAME=`(PlistBuddy -c \"print CFBundleExecutable\" ${INFOPLIST_FILE})`\ndsymutil -o ${BUILT_PRODUCTS_DIR}/Harness.app.dSYM ${SOURCE_ROOT}/Application/${ACTUAL_EXECUTABLE_NAME}";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */

View File

@ -60,29 +60,6 @@ template("xcode_harness_ios") {
]
}
dsym_gen_target_name = app_name + "_dsym"
action(dsym_gen_target_name) {
sources = [
"$root_build_dir/$app_name"
]
script = ios_app_script
outputs = [
"$root_build_dir/$xcode_project_gen_target_name/Harness.app.dSYM"
]
args = [
"dsym",
"-e",
rebase_path("$root_build_dir/$app_name", root_build_dir),
"-o",
rebase_path("$root_build_dir/$xcode_project_gen_target_name/Harness.app.dSYM", root_build_dir),
]
deps = invoker.deps
}
bundle_copy_gen_target_name = app_name + "_bundle_copy"
copy(bundle_copy_gen_target_name) {
sources = [
@ -98,7 +75,6 @@ template("xcode_harness_ios") {
group(target_name) {
deps = [
":$xcode_project_gen_target_name",
":$dsym_gen_target_name",
":$bundle_copy_gen_target_name",
]
}