Merge "ANDROID: build: Add copy of symbol list file to common directory"

android/abi_gki_aarch64.stg

@@ -352629,6 +352629,15 @@ elf_symbol {
   type_id: 0x599826a1
   full_name: "system_32bit_el0_cpumask"
 }
+elf_symbol {
+  id: 0xb5701f35
+  name: "system_freezable_power_efficient_wq"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xd067d3c5
+  type_id: 0x13f8b706
+  full_name: "system_freezable_power_efficient_wq"
+}
 elf_symbol {
   id: 0xeeb4dc4c
   name: "system_freezable_wq"
@@ -376434,6 +376443,10 @@ symbols {
     key: "system_32bit_el0_cpumask"
     value: 0xb6c44fb1
   }
+  symbol {
+    key: "system_freezable_power_efficient_wq"
+    value: 0xb5701f35
+  }
   symbol {
     key: "system_freezable_wq"
     value: 0xeeb4dc4c

android/abi_gki_aarch64_qcom

@@ -3344,6 +3344,7 @@
   sysfs_streq
   sysrq_mask
   system_32bit_el0_cpumask
+  system_freezable_power_efficient_wq
   system_freezable_wq
   system_highpri_wq
   system_long_wq

build_with_bazel.py

@@ -8,6 +8,7 @@ import glob
 import logging
 import os
 import re
+import shutil
 import sys
 import subprocess
 
@@ -65,6 +66,13 @@ class BazelBuilder:
             "--host_crosstool_top={}".format(HOST_CROSSTOOL),
         ]
 
+    def copy_abi_file(self):
+        """Copy ABI STG file from msm-kernel to common"""
+        msm_sym_list = os.path.join(self.workspace, "msm-kernel", "android", "abi_gki_aarch64_qcom")
+
+        if os.path.exists(msm_sym_list):
+            shutil.copy2(msm_sym_list, os.path.join(self.workspace, "common", "android", "abi_gki_aarch64_qcom"))
+
     def setup_extensions(self):
         """Set up the extension files if needed"""
         for (ext, def_src) in [
@@ -290,6 +298,7 @@ class BazelBuilder:
             sys.exit(1)
 
         self.clean_legacy_generated_files()
+        self.copy_abi_file()
 
         if self.skip_list:
             self.user_opts.extend(["--//msm-kernel:skip_{}=true".format(s) for s in self.skip_list])