commit c9802b3bfc7fec7b0c900e7c51b0077549dd00cb
author Daniel Norman <danielnorman@google.com> Fri Jul 30 09:13:41 2021 -0700
committer Daniel Norman <danielnorman@google.com> Fri Jul 30 10:53:47 2021 -0700
tree ff3a5b34f934aaf28619d218a866809091204664
parent 3b9713151475ecee56acbf358480223211584628

Include vmlinux in the fetched kernel artifacts.

Bug: 195097892
Test: Create a repacked GKI build, observe vmlinux in 'kernel/'
      artifacts folder.
Change-Id: I3356621b38609c1f7a6c5493b1f198e0697ef0b3

gki/repack_gki.py

diff --git a/gki/repack_gki.py b/gki/repack_gki.py
index 38e50fd..3c12c56 100644
--- a/gki/repack_gki.py
+++ b/gki/repack_gki.py
@@ -84,6 +84,7 @@
     copy_kernel_file(kernel_dir, 'System.map')
     copy_kernel_file(kernel_dir, 'abi.xml')
     copy_kernel_file(kernel_dir, 'abi_symbollist')
+    copy_kernel_file(kernel_dir, 'vmlinux')
     copy_kernel_file(kernel_dir, 'Image',
                      'kernel-{}'.format(args.kernel_version))
     copy_kernel_file(kernel_dir, 'Image.lz4',

gki/repack_gki_lib.py

diff --git a/gki/repack_gki_lib.py b/gki/repack_gki_lib.py
index 6df90d1..f48c832 100644
--- a/gki/repack_gki_lib.py
+++ b/gki/repack_gki_lib.py
@@ -29,7 +29,7 @@
       client=client,
       build_id=build_id,
       target=kernel_target,
-      pattern=r'(Image|Image.lz4|System\.map|abi.xml|abi_symbollist)',
+      pattern=r'(Image|Image.lz4|System\.map|abi.xml|abi_symbollist|vmlinux)',
       out_dir=kernel_dir)
   fetcher_lib.fetch_artifacts(
       client=client,