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

Commit 7f277d58 authored by Ted Bauer's avatar Ted Bauer
Browse files

aconfig: comment out new storage invocations 

We need to comment all new storage invocations so we can make some
changes to the new storage API in AOSP and have them submit cleanly.

Bug: 301491148
Test: m
Change-Id: I13ce906efc0a80a47452e12bbf9d4e7c0b2c4b99
Ignore-AOSP-First: internal storage migration, this code will be deleted
parent e851b8f7

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::{info, error, LevelFilter};
@@ -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::{info, error, LevelFilter};
@@ -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::{info, error, LevelFilter};

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::\{info, error, LevelFilter};
@@ -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 }}