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

Commit 0eb62037 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP3A.250425.001 

Snap for 13403772 from 8f4dd93b to 25Q3-release

Change-Id: I22418e8bca4b2dd2fadd3770074bf5d89fadf42c
parents 6022b524 8f4dd93b

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3508,7 +3508,7 @@ $(check-selinux-treble-labeling.timestamp): $(HOST_OUT_EXECUTABLES)/treble_label 
check-selinux-treble-labeling: $(check-selinux-treble-labeling.timestamp)



ifeq ($(PRODUCT_ENFORCE_SELINUX_TREBLE_LABELING),true)

droidcore: $(check-selinux-treble-labeling)

droidcore: check-selinux-treble-labeling

endif  # PRODUCT_ENFORCE_SELINUX_TREBLE_LABELING



platform-preinstalled-apps-patterns :=

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=BP3A.250424.003
 
BUILD_ID=BP3A.250425.001

tools/aconfig/convert_finalized_flags/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ rust_defaults { 
        "libserde_json",

        "libtinytemplate",

    ],

    cfgs: select(release_flag("RELEASE_ACONFIG_SUPPORT_MINOR_SDK"), {

    features: select(release_flag("RELEASE_ACONFIG_SUPPORT_MINOR_SDK"), {

        true: ["support_minor_sdk"],

        default: [],

    }),

tools/aconfig/convert_finalized_flags/Cargo.toml

+1 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ edition = "2021" 
[features]

default = ["cargo"]

cargo = []

support_minor_sdk = []



[dependencies]

anyhow = "1.0.69"
@@ -13,6 +14,3 @@ clap = { version = "4.1.8", features = ["derive"] } 
serde = { version = "1.0.152", features = ["derive"] }

serde_json = "1.0.93"

tempfile = "3.13.0"
 


[lints.rust]

unexpected_cfgs = { level = "warn", check-cfg = ['cfg(support_minor_sdk)'] }

tools/aconfig/convert_finalized_flags/src/lib.rs

+7 −7
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ impl FromStr for ApiLevel { 
            return Ok(ApiLevel::from_sdk_int(float_value as u32));

        }



        if cfg!(support_minor_sdk) {

        if cfg!(feature = "support_minor_sdk") {

            match parse_full_version(s.to_string()) {

                Ok(full_sdk_int) => Ok(ApiLevel::from_sdk_int_full(full_sdk_int)),

                Err(e) => Err(e),
@@ -328,7 +328,7 @@ mod tests { 
        assert!(map.0.get(&ApiLevel::from_sdk_int(36)).unwrap().contains(&flags[2]));

    }



    #[cfg(not(support_minor_sdk))]

    #[cfg(not(feature = "support_minor_sdk"))]

    #[test]

    fn test_read_flags_fractions_round_up() {

        let flags = create_test_flags();
@@ -364,7 +364,7 @@ mod tests { 
        assert!(map.0.get(&ApiLevel::from_sdk_int(37)).unwrap().contains(&flags[2]));

    }



    #[cfg(support_minor_sdk)]

    #[cfg(feature = "support_minor_sdk")]

    #[test]

    fn test_read_flags_fractions_creates_full_sdk() {

        let flags = create_test_flags();
@@ -394,10 +394,10 @@ mod tests { 


        // Support 35.1 and 36.0.

        assert_eq!(map.0.len(), 2);

        assert!(!map.0.contains_key(&ApiLevel::sdk_int(36)));

        assert!(map.0.get(&ApiLevel::sdk_int_full(3_600_001)).unwrap().contains(&flags[0]));

        assert!(map.0.get(&ApiLevel::sdk_int(37)).unwrap().contains(&flags[1]));

        assert!(map.0.get(&ApiLevel::sdk_int(37)).unwrap().contains(&flags[2]));

        assert!(!map.0.contains_key(&ApiLevel::from_sdk_int(36)));

        assert!(map.0.get(&ApiLevel::from_sdk_int_full(3_600_001)).unwrap().contains(&flags[0]));

        assert!(map.0.get(&ApiLevel::from_sdk_int(37)).unwrap().contains(&flags[1]));

        assert!(map.0.get(&ApiLevel::from_sdk_int(37)).unwrap().contains(&flags[2]));

    }



    #[test]