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

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

Make change and version bump to BP3A.250424.001 

Snap for 13396955 from 95ae9e91 to 25Q3-release

Change-Id: I7b2faf78926063a9390bc73b6296c5095ef386d6
parents a7755565 95ae9e91

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.250423.002
 
BUILD_ID=BP3A.250424.001

core/packaging/flags.mk

+3 −4
Original line number Diff line number Diff line
@@ -119,10 +119,9 @@ define generate-partition-aconfig-storage-file 
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))

$(eval $(strip $(1)): PRIVATE_IN := $(strip $(9)))



ifneq (,$(RELEASE_FINGERPRINT_ACONFIG_PACKAGES))

STORAGE_FILE_VERSION := 2

else

STORAGE_FILE_VERSION := 1

STORAGE_FILE_VERSION := $(RELEASE_ACONFIG_STORAGE_VERSION)

ifeq (,$(STORAGE_FILE_VERSION))

STORAGE_FILE_VERSION := "2"

endif



$(strip $(1)): $(ACONFIG) $(strip $(9))

tools/aconfig/aconfig/src/storage/mod.rs

+7 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ pub struct FlagPackage<'a> { 
    pub package_name: &'a str,

    pub package_id: u32,

    pub fingerprint: u64,

    pub redact_exported_reads: bool,

    pub flag_names: HashSet<&'a str>,

    pub boolean_flags: Vec<&'a ProtoParsedFlag>,

    // The index of the first boolean flag in this aconfig package among all boolean
@@ -48,6 +49,7 @@ impl<'a> FlagPackage<'a> { 
            package_name,

            package_id,

            fingerprint: 0,

            redact_exported_reads: false,

            flag_names: HashSet::new(),

            boolean_flags: vec![],

            boolean_start_index: 0,
@@ -95,6 +97,8 @@ where 
            let fingerprint = compute_flags_fingerprint(&mut flag_names_vec);

            p.fingerprint = fingerprint;

        }



        // TODO - b/377311211: Set redact_exported_reads if the build flag is enabled.

    }



    packages
@@ -133,7 +137,6 @@ where 


#[cfg(test)]

mod tests {

    use aconfig_storage_file::DEFAULT_FILE_VERSION;



    use super::*;

    use crate::commands::Input;
@@ -185,10 +188,11 @@ mod tests { 
            .collect()

    }



    // Storage file v1.

    #[test]

    fn test_flag_package() {

        let caches = parse_all_test_flags();

        let packages = group_flags_by_package(caches.iter(), DEFAULT_FILE_VERSION);

        let packages = group_flags_by_package(caches.iter(), 1);



        for pkg in packages.iter() {

            let pkg_name = pkg.package_name;
@@ -228,6 +232,7 @@ mod tests { 
        assert_eq!(packages[2].fingerprint, 0);

    }



    // Storage file v2.

    #[test]

    fn test_flag_package_with_fingerprint() {

        let caches = parse_all_test_flags();

tools/aconfig/aconfig/src/storage/package_table.rs

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ impl PackageTableNodeWrapper { 
            package_name: String::from(package.package_name),

            package_id: package.package_id,

            fingerprint: package.fingerprint,

            redact_exported_reads: package.redact_exported_reads,

            boolean_start_index: package.boolean_start_index,

            next_offset: None,

        };

tools/aconfig/aconfig_storage_file/src/lib.rs

+2 −2
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ use crate::AconfigStorageError::{ 


/// The max storage file version from which we can safely read/write. May be

/// experimental.

pub const MAX_SUPPORTED_FILE_VERSION: u32 = 2;

pub const MAX_SUPPORTED_FILE_VERSION: u32 = 3;



/// The newest fully-released version. Unless otherwise specified, this is the

/// version we will write.

pub const DEFAULT_FILE_VERSION: u32 = 1;

pub const DEFAULT_FILE_VERSION: u32 = 2;



/// Good hash table prime number

pub(crate) const HASH_PRIMES: [u32; 29] = [