From b53a858400c2b51b96581dddb877f04f16d12a21 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Wed, 14 Nov 2018 12:47:01 -0800
Subject: [PATCH] build: use different directory for generated breakpad symbols
 (#15716)

---
 .circleci/config.yml     | 2 +-
 appveyor.yml             | 2 +-
 script/dump-symbols.py   | 2 +-
 script/upload-symbols.py | 4 +---
 script/zip-symbols.py    | 2 +-
 vsts.yml                 | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f09dee131c2e..7b6fa61ea4eb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -353,7 +353,7 @@ step-generate-breakpad-symbols: &step-generate-breakpad-symbols
     command: |
       cd src
       export BUILD_PATH="$PWD/out/Default"
-      export DEST_PATH="$BUILD_PATH/electron.breakpad.syms"
+      export DEST_PATH="$BUILD_PATH/breakpad_symbols"
       electron/script/dump-symbols.py -b $BUILD_PATH -d $DEST_PATH -v
 
 step-zip-symbols: &step-zip-symbols
diff --git a/appveyor.yml b/appveyor.yml
index 647e38ee9488..aa458bd76fa5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -70,7 +70,7 @@ build_script:
       if ($env:GN_CONFIG -eq 'release') {
         ninja -C out/Default third_party/breakpad:dump_syms
       }
-  - if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\electron.breakpad.syms -v)
+  - if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\breakpad_symbols -v)
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         python electron\script\zip-symbols.py
diff --git a/script/dump-symbols.py b/script/dump-symbols.py
index 36286edf7018..cb9f4cefeb93 100755
--- a/script/dump-symbols.py
+++ b/script/dump-symbols.py
@@ -72,7 +72,7 @@ def generate_posix_symbols(binary, source_root, build_dir, destination):
     '--binary={0}'.format(binary),
   ]
   if is_verbose_mode():
-    args += ['-v']
+    args += ['--verbose']
   execute([sys.executable, generate_breakpad_symbols] + args)
 
 def parse_args():
diff --git a/script/upload-symbols.py b/script/upload-symbols.py
index 156ff415bd72..3e4e7e7b700c 100755
--- a/script/upload-symbols.py
+++ b/script/upload-symbols.py
@@ -14,9 +14,7 @@ RELEASE_DIR = get_out_dir()
 
 PROJECT_NAME = get_electron_branding()['project_name']
 PRODUCT_NAME = get_electron_branding()['product_name']
-SYMBOLS_DIR = os.path.join(
-  RELEASE_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME)
-)
+SYMBOLS_DIR = os.path.join(RELEASE_DIR, 'breakpad_symbols')
 
 PDB_LIST = [
   os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME))
diff --git a/script/zip-symbols.py b/script/zip-symbols.py
index 745ef5aa2b11..411739514ea9 100755
--- a/script/zip-symbols.py
+++ b/script/zip-symbols.py
@@ -24,7 +24,7 @@ def main():
   licenses = ['LICENSE', 'LICENSES.chromium.html', 'version']
 
   with scoped_cwd(args.build_dir):
-    dirs = ['{0}.breakpad.syms'.format(PROJECT_NAME)]
+    dirs = ['breakpad_symbols']
     print('Making symbol zip: ' + zip_file)
     make_zip(zip_file, licenses, dirs)
 
diff --git a/vsts.yml b/vsts.yml
index 4fddc0920f05..303706d4fd7b 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -110,7 +110,7 @@ jobs:
       # TODO(alexeykuzmin): Explicitly pass an out folder path to the scripts.
       export ELECTRON_OUT_DIR=Default
 
-      electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
+      electron/script/dump-symbols.py -d "$PWD/out/Default/breakpad_symbols"
       electron/script/zip-symbols.py
     displayName: Collect symbols
     condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))