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

Commit 31a563ac authored by Ted Bauer's avatar Ted Bauer Committed by Android (Google) Code Review
Browse files

Merge "aconfig: comment out new storage invocations" into main

parents 41c561cb 7f277d58

tools/aconfig/aconfig/src/codegen/rust.rs

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ mod tests { 


    const PROD_EXPECTED: &str = r#"

//! codegenerated rust flag lib

use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

// use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

use std::path::Path;

use std::io::Write;

use log::{log, LevelFilter, Level};
@@ -510,7 +510,7 @@ pub fn reset_flags() { 


    const EXPORTED_EXPECTED: &str = r#"

//! codegenerated rust flag lib

use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

// use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

use std::path::Path;

use std::io::Write;

use log::{log, LevelFilter, Level};
@@ -584,7 +584,7 @@ pub fn enabled_ro_exported() -> bool { 


    const FORCE_READ_ONLY_EXPECTED: &str = r#"

//! codegenerated rust flag lib

use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

// use aconfig_storage_read_api::{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

use std::path::Path;

use std::io::Write;

use log::{log, LevelFilter, Level};

tools/aconfig/aconfig/templates/rust.template

+4 −1
Original line number Diff line number Diff line 
//! codegenerated rust flag lib



use aconfig_storage_read_api::\{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

// use aconfig_storage_read_api::\{StorageFileType, get_mapped_storage_file, get_boolean_flag_value, get_package_offset};

use std::path::Path;

use std::io::Write;

use log::\{log, LevelFilter, Level};
@@ -61,6 +61,7 @@ pub fn {flag.name}() -> bool \{ 
        return result;

    }



    /*

    // This will be called multiple times. Subsequent calls after the first

    // are noops.

    logger::init(
@@ -111,6 +112,8 @@ pub fn {flag.name}() -> bool \{ 
        }

    }



    */



    result

    {{ endif }}

{{ -endif }}