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

Commit 9a8d7f14 authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "aconfig: update error message in modify_parsed_flags_based_on_mode" into main am: 9cd08c66 

Original change: https://android-review.googlesource.com/c/platform/build/+/2883810



Change-Id: Ifb6a5be4ec0a5ded4ca3b936d184699bc8061fd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0b2dfed 9cd08c66

tools/aconfig/src/commands.rs

+2 −5
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ pub fn modify_parsed_flags_based_on_mode( 
        }

    };

    if modified_parsed_flags.is_empty() {

        bail!("{} library contains no exported flags.", codegen_mode);

        bail!("{codegen_mode} library contains no {codegen_mode} flags");

    }



    Ok(modified_parsed_flags)
@@ -653,9 +653,6 @@ mod tests { 
        parsed_flags.parsed_flag.retain_mut(|pf| !pf.is_exported());

        let error =

            modify_parsed_flags_based_on_mode(parsed_flags, CodegenMode::Exported).unwrap_err();

        assert_eq!(

            format!("{} library contains no exported flags.", CodegenMode::Exported),

            format!("{:?}", error)

        );

        assert_eq!("exported library contains no exported flags", format!("{:?}", error));

    }

}