commit 0229bf2584d14adcfdf5bf24c28b40d21ab26e3f
author P.Y. Laligand <pylaligand@google.com> Thu Dec 06 16:46:25 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Dec 07 18:23:42 2018 +0000
tree 57aa7c7e5aae1b435e2bb4da9363f0270fb5494a
parent dcddd342a84a53adc01c873ebea6f39a03e6f405

[sdk][bazel] Install debug binaries in the proper location.

Test: verified that the .build-id directory was preserved.
Bug: DX-401
Change-Id: Iecc083aaceecd9dab74e2b2e744fb26e5d173b57

sdk/bazel/generate.py

diff --git a/sdk/bazel/generate.py b/sdk/bazel/generate.py
index b167224..9e1d7e8 100755
--- a/sdk/bazel/generate.py
+++ b/sdk/bazel/generate.py
@@ -41,7 +41,7 @@
         self.workspace_info = SdkWorkspaceInfo()
 
 
-    def _copy_file(self, file, root, destination, result=[]):
+    def _copy_file(self, file, root='', destination='', result=[]):
         '''Copies the file from a given root directory and writes the
         resulting relative paths to a list.
         '''
@@ -53,7 +53,7 @@
         result.append(relative_path)
 
 
-    def _copy_files(self, files, root, destination, result=[]):
+    def _copy_files(self, files, root='', destination='', result=[]):
         '''Copies some files from a given root directory and writes the
         resulting relative paths to a list.
         '''
@@ -197,6 +197,9 @@
                 prebuilt_set.dist_lib = _copy_prebuilt(dist, 'dist')
                 prebuilt_set.dist_path = 'lib/' + os.path.basename(dist)
 
+            if 'debug' in binaries:
+                self._copy_file(binaries['debug'])
+
             library.prebuilts[arch] = prebuilt_set
 
         for dep in atom['deps']:
@@ -242,7 +245,8 @@
             arch_data = atom['versions'][arch]
             self._copy_files(arch_data['headers'], arch_data['root'], base)
             self._copy_files(arch_data['link_libs'], arch_data['root'], base)
-            self._copy_files(arch_data['debug_libs'], arch_data['root'], base)
+            # We maintain debug files in their original location.
+            self._copy_files(arch_data['debug_libs'])
             dist_libs = []
             self._copy_files(arch_data['dist_libs'], arch_data['root'], base,
                              dist_libs)