extract_utils: Add support to create filegroups of proprietary files

Change-Id: I59d7995f67c7af061c59b44f3ce4aa6f169f6a9d

Author: ArianK16a

extract_utils/file.py

@@ -61,6 +61,7 @@ class FileArgs(str, Enum):
     SKIPAPKCHECKS = 'SKIPAPKCHECKS'
     SYMLINK = 'SYMLINK'
     TRYSRCFIRST = 'TRYSRCFIRST'
+    FILEGROUP = 'FILEGROUP'
 
 
 FILE_ARGS_TYPE_MAP = {
@@ -84,6 +85,7 @@ class FileArgs(str, Enum):
     FileArgs.SKIPAPKCHECKS: True,
     FileArgs.SYMLINK: list,
     FileArgs.TRYSRCFIRST: True,
+    FileArgs.FILEGROUP: list,
 }
 
 assert len(FileArgs) == len(FILE_ARGS_TYPE_MAP)
@@ -302,6 +304,10 @@ def inferred_bits(self):
         else:
             raise ValueError(f'Cannot infer bits from file path: {self.src}')
 
+    @property
+    def filegroups(self):
+        return self.args.get(FileArgs.FILEGROUP)
+
 
 T = TypeVar('T')
 
@@ -496,6 +502,7 @@ def __init__(
         self.boot_jars = FileTree()
         self.dummy_shared_libs = FileTree()
         self.package_symlinks = SimpleFileList()
+        self.filegroup_files = SimpleFileList()
         self.copy_files = SimpleFileList()
         self.all_files = SimpleFileList()
 
@@ -541,6 +548,9 @@ def __add_file(self, file: File, section: Optional[str]):
             self.dummy_shared_libs.add(file)
             return
 
+        if FileArgs.FILEGROUP in file.args:
+            self.filegroup_files.add(file)
+
         if self.__section is None or (
             section is not None and fnmatch.fnmatch(section, self.__section)
         ):

extract_utils/makefiles.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import os
+from collections import defaultdict
 from contextlib import ExitStack, contextmanager
 from json import JSONEncoder
 from typing import Iterable, List, Optional, Protocol, TextIO
@@ -690,6 +691,33 @@ def write_symlink_packages(
     write_packages_inclusion(package_names, ctx.product_mk_out)
 
 
+def write_filegroups(
+    ctx: MakefilesCtx,
+    vendor_rel_sub_path: str,
+    files: Iterable[File],
+):
+    encoder = BpJSONEncoder(legacy=ctx.legacy)
+    filegroup_to_files = defaultdict(list)
+
+    for file in files:
+        filegroups = file.filegroups
+        assert isinstance(filegroups, list)
+
+        for filegroup in filegroups:
+            filegroup_to_files[filegroup].append(file)
+
+    for filegroup, files in filegroup_to_files.items():
+        (
+            BpBuilder(encoder)
+            .set_rule_name('filegroup')
+            .name(filegroup)
+            .set(
+                'srcs', [f'{vendor_rel_sub_path}/{file.dst}' for file in files]
+            )
+            .write(ctx.bp_out)
+        )
+
+
 def write_mk_firmware_ab_partitions(files: Iterable[File], out: TextIO):
     has_ab = False
     for file in files:

extract_utils/module.py

@@ -29,6 +29,7 @@
     write_bp_header,
     write_bp_soong_namespaces,
     write_dummy_shared_libs,
+    write_filegroups,
     write_mk_firmware,
     write_mk_firmware_ab_partitions,
     write_mk_firmware_file,
@@ -211,6 +212,12 @@ def write_makefiles(self, module: ExtractUtilsModule, ctx: MakefilesCtx):
             self.file_list.package_symlinks,
         )
 
+        write_filegroups(
+            ctx,
+            self.vendor_rel_sub_path,
+            self.file_list.filegroup_files,
+        )
+
         write_boot_jars(
             ctx,
             self.file_list.boot_jars,