Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b7f6661 authored by Yu Shan's avatar Yu Shan
Browse files

Fix a bug for generating enum script. 

We were previously checking "/**" as the start of a comment, however
some properties was using "/*" which causes the script to generate
wrong enums. This CL fixes this issue.

Test: Local run.
Bug: 238944990
Change-Id: I56c350663fdde15a405b11fd108df0c7b1f4eb3a
parent c4d46b4d

automotive/vehicle/aidl/generated_lib/cpp/AccessForVehicleProperty.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::IGNITION_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::ABS_ACTIVE, VehiclePropertyAccess::READ},

        {VehicleProperty::TRACTION_CONTROL_ACTIVE, VehiclePropertyAccess::READ},

        {VehicleProperty::HVAC_FAN_SPEED, VehiclePropertyAccess::READ},

        {VehicleProperty::HVAC_FAN_SPEED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HVAC_FAN_DIRECTION, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HVAC_TEMPERATURE_CURRENT, VehiclePropertyAccess::READ},

        {VehicleProperty::HVAC_TEMPERATURE_SET, VehiclePropertyAccess::READ_WRITE},

automotive/vehicle/aidl/generated_lib/java/AccessForVehicleProperty.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.IGNITION_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.ABS_ACTIVE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.TRACTION_CONTROL_ACTIVE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.HVAC_FAN_SPEED, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.HVAC_FAN_SPEED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.HVAC_FAN_DIRECTION, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.HVAC_TEMPERATURE_CURRENT, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.HVAC_TEMPERATURE_SET, VehiclePropertyAccess.READ_WRITE),

automotive/vehicle/tools/generate_annotation_enums.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ACCESS_JAVA_FILE_PATH = ("hardware/interfaces/automotive/vehicle/aidl/generated_ 
TAB = "    "

RE_ENUM_START = re.compile("\s*enum VehicleProperty \{")

RE_ENUM_END = re.compile("\s*\}\;")

RE_COMMENT_BEGIN = re.compile("\s*\/\*\*")

RE_COMMENT_BEGIN = re.compile("\s*\/\*\*?")

RE_COMMENT_END = re.compile("\s*\*\/")

RE_CHANGE_MODE = re.compile("\s*\* @change_mode (\S+)\s*")

RE_ACCESS = re.compile("\s*\* @access (\S+)\s*")