extract_utils: remove type hints for BpBuilder methods returning self

By explicitly returning BpBuilder in these methods, we prevent
the type checker from resolving proper Self types for FileBpBuilder.

Change-Id: I41ab2fa73d562fc6756ffb58a26c731c41ee7201

Author: Demon000

extract_utils/bp_builder.py

@@ -78,23 +78,23 @@ def set_rule_name(self, rule_name: str):
         self.__rule_name = rule_name
         return self
 
-    def set(self, k, v, optional=False) -> BpBuilder:
+    def set(self, k, v, optional=False):
         assert v is not None or optional
         if v is not None:
             self.o[k] = v
         return self
 
-    def name(self, package_name: str) -> BpBuilder:
+    def name(self, package_name: str):
         self.set('name', package_name)
         return self
 
-    def stem(self, stem: Optional[str]) -> BpBuilder:
+    def stem(self, stem: Optional[str]):
         return self.set('stem', stem, optional=True)
 
-    def owner(self) -> BpBuilder:
+    def owner(self):
         return self.set('owner', self.__owner)
 
-    def specific(self) -> BpBuilder:
+    def specific(self):
         if self.__partition is None:
             return self
 
@@ -104,31 +104,31 @@ def specific(self) -> BpBuilder:
 
         return self.set(f'{specific}_specific', True)
 
-    def __multilib(self, bits: Multilib) -> BpBuilder:
+    def __multilib(self, bits: Multilib):
         return self.set('compile_multilib', bits)
 
-    def multilib(self, bits: int) -> BpBuilder:
+    def multilib(self, bits: int):
         value = Multilib.from_int(bits)
         return self.__multilib(value)
 
-    def multilibs(self, bitses: List[int]) -> BpBuilder:
+    def multilibs(self, bitses: List[int]):
         value = Multilib.from_int_list(bitses)
         return self.__multilib(value)
 
-    def check_elf(self, enable_checkelf: bool) -> BpBuilder:
+    def check_elf(self, enable_checkelf: bool):
         if not enable_checkelf:
             self.set('check_elf_files', False)
         return self
 
-    def no_strip(self) -> BpBuilder:
+    def no_strip(self):
         return self.set(
             'strip',
             {
                 'none': True,
             },
         )
 
-    def prefer(self) -> BpBuilder:
+    def prefer(self):
         return self.set('prefer', True)
 
     def write(self, out):
@@ -167,33 +167,33 @@ def __file_dir_without_prefix(self) -> Optional[str]:
 
         return remaining
 
-    def relative_install_path(self) -> BpBuilder:
+    def relative_install_path(self):
         p = self.__file_dir_without_prefix()
         return self.set('relative_install_path', p, optional=True)
 
-    def sub_dir(self) -> BpBuilder:
+    def sub_dir(self):
         p = self.__file_dir_without_prefix()
         return self.set('sub_dir', p, optional=True)
 
     def __file_rel_sub_path(self, file_rel_path: str) -> str:
         return f'{self.__rel_sub_path}/{file_rel_path}'
 
-    def src(self) -> BpBuilder:
+    def src(self):
         rel_path = self.__file_rel_sub_path(self.__file.dst)
         return self.set('src', rel_path)
 
-    def apk(self) -> BpBuilder:
+    def apk(self):
         rel_path = self.__file_rel_sub_path(self.__file.dst)
         return self.set('apk', rel_path)
 
-    def jars(self) -> BpBuilder:
+    def jars(self):
         rel_path = self.__file_rel_sub_path(self.__file.dst)
         return self.set('jars', [rel_path])
 
-    def filename(self) -> BpBuilder:
+    def filename(self):
         return self.set('filename', self.__file.basename)
 
-    def signature(self) -> BpBuilder:
+    def signature(self):
         if self.__file.presigned:
             self.set('preprocessed', True)
             self.set('presigned', True)
@@ -203,16 +203,14 @@ def signature(self) -> BpBuilder:
             self.set('certificate', 'platform')
         return self
 
-    def skip_preprocessed_apk_checks(self) -> BpBuilder:
+    def skip_preprocessed_apk_checks(self):
         return self.set(
             'skip_preprocessed_apk_checks',
             self.__file.skip_preprocessed_apk_checks,
             optional=True,
         )
 
-    def target(
-        self, f: File, machine: EM, deps: Optional[List[str]]
-    ) -> BpBuilder:
+    def target(self, f: File, machine: EM, deps: Optional[List[str]]):
         target = self.o.setdefault('target', {})
 
         rel_path = self.__file_rel_sub_path(f.dst)
@@ -229,7 +227,7 @@ def targets(
         files: List[File],
         machines: List[EM],
         depses: List[Optional[List[str]]],
-    ) -> BpBuilder:
+    ):
         for f, machine, deps in zip(files, machines, depses):
             self.target(f, machine, deps)
         return self