extract_utils: fix rules for QDSP6 blobs

 * Disable ELF check. It won't work and will break the build.
 * Infer the bits from file path. QDSP6 blobs are observe in
   vendor/lib64, so the assumption of QDSP6 being placed in lib no
   longer holds.

Change-Id: Ic8344f40d2e0f366752c8ddeb6962f5d20c4a0f5

Author: moetayuko

extract_utils/bp_builder.py

@@ -14,7 +14,6 @@
 
 MACHINE_TARGET_MAP = {
     EM.ARM: 'android_arm',
-    EM.QDSP6: 'android_arm',
     EM.AARCH64: 'android_arm64',
     EM.X86: 'android_x86',
     EM.X86_64: 'android_x86_64',
@@ -219,7 +218,10 @@ 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)
-        arch = MACHINE_TARGET_MAP[machine]
+        if machine == EM.QDSP6:
+            arch = 'android_arm64' if f.inferred_bits == 64 else 'android_arm'
+        else:
+            arch = MACHINE_TARGET_MAP[machine]
         target[arch] = {'srcs': [rel_path]}
 
         if deps:

extract_utils/file.py

@@ -293,6 +293,15 @@ def privileged(self):
     def skip_preprocessed_apk_checks(self):
         return self.args.get(FileArgs.SKIPAPKCHECKS)
 
+    @property
+    def inferred_bits(self):
+        if self.contains_path_parts(LIB_PARTS):
+            return 32
+        elif self.contains_path_parts(LIB64_PARTS):
+            return 64
+        else:
+            raise ValueError(f'Cannot infer bits from file path: {self.src}')
+
 
 T = TypeVar('T')
 

extract_utils/makefiles.py

@@ -16,6 +16,7 @@
     get_file_machine_bits_libs,
     remove_libs_so_ending,
 )
+from extract_utils.elf_parser import EM
 from extract_utils.file import (
     CommonFileTree,
     File,
@@ -204,6 +205,11 @@ def write_elfs_package(
         if is_bin and (machine is None or bits is None):
             return write_sh_package(files[0], builder, any_extension=True)
 
+        if machine == EM.QDSP6:
+            libs = None
+            enable_check_elf = False
+            bits = f.inferred_bits
+
         deps = remove_libs_so_ending(libs)
         deps = run_libs_fixup(ctx.lib_fixups, deps, file.partition)
         machines.append(machine)