Merge "aconfig: comment out new storage invocations" into main
diff --git a/tools/aconfig/aconfig/src/codegen/rust.rs b/tools/aconfig/aconfig/src/codegen/rust.rs
index ec1784a..db3003d 100644
--- a/tools/aconfig/aconfig/src/codegen/rust.rs
+++ b/tools/aconfig/aconfig/src/codegen/rust.rs
@@ -107,7 +107,7 @@
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 @@
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 @@
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};
diff --git a/tools/aconfig/aconfig/templates/rust.template b/tools/aconfig/aconfig/templates/rust.template
index 766fee9..2f97c14 100644
--- a/tools/aconfig/aconfig/templates/rust.template
+++ b/tools/aconfig/aconfig/templates/rust.template
@@ -1,6 +1,6 @@
//! 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 @@
return result;
}
+ /*
// This will be called multiple times. Subsequent calls after the first
// are noops.
logger::init(
@@ -111,6 +112,8 @@
}
}
+ */
+
result
{{ endif }}
{{ -endif }}