commit be73c52729c8061cd86903007ab5483fd69f8175
author Mikhail Naganov <mnaganov@google.com> Tue Nov 10 21:35:52 2020 +0000
committer Mikhail Naganov <mnaganov@google.com> Tue Dec 01 23:41:03 2020 +0000
tree a03c24135fa6e03660b2f5ca705ece0a4d787f27
parent dc6be0d5754e65ffa07fe8ef04ca4d28c2c0268b

Fix buildCommonTypesStructureFile.py script

The PFW script buildCommonTypesStructureFile.py got broken
by the change which had moved many enums to audio-hal-enums.h
header. This change makes necessary adjustments to restore
its functionality and preserve the generated PFW config file
contents.

Bug: 142480271
Bug: 172641529
Test: m
Test: atest libmedia_helper_tests
Test: diff vendor/etc/parameter-framework contents for a device
Change-Id: I15db2ce6bf9c408b96b6921a45093e2849826e24
Merged-In: I15db2ce6bf9c408b96b6921a45093e2849826e24

services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py

diff --git a/services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py b/services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py
index f060d45..5083b14 100755
--- a/services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py
+++ b/services/audiopolicy/engineconfigurable/tools/buildCommonTypesStructureFile.py
@@ -126,9 +126,9 @@
     ignored_values = ['CNT', 'MAX', 'ALL', 'NONE']
 
     criteria_pattern = re.compile(
-        r"\s*(?P<type>(?:"+'|'.join(component_type_mapping_table.keys()) + "))_" \
-        r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*=\s*" \
-        r"(?P<values>(?:0[xX])?[0-9a-fA-F]+)")
+        r"\s*V\((?P<type>(?:"+'|'.join(component_type_mapping_table.keys()) + "))_" \
+        r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*,\s*" \
+        r"(?:AUDIO_DEVICE_BIT_IN \| )?(?P<values>(?:0[xX])[0-9a-fA-F]+|[0-9]+)")
 
     logging.info("Checking Android Header file {}".format(androidaudiobaseheaderFile))
 
@@ -164,6 +164,13 @@
 
             logging.debug("type:{}, literal:{}, values:{}.".format(component_type_name, component_type_literal, component_type_numerical_value))
 
+    if "stub" not in all_component_types["OutputDevicesMask"]:
+        all_component_types["OutputDevicesMask"]["stub"] = 0x40000000
+        logging.info("added stub output device mask")
+    if "stub" not in all_component_types["InputDevicesMask"]:
+        all_component_types["InputDevicesMask"]["stub"] = 0x40000000
+        logging.info("added stub input device mask")
+
     # Transform input source in inclusive criterion
     shift = len(all_component_types['OutputDevicesMask'])
     if shift > 32: