tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "aconfig: add support for local override" into main

Browse source
This commit is contained in:
Dennis Shen 2024-04-17 19:07:56 +00:00 committed by Gerrit Code Review
commit e6b424ad4a
4 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/aconfig/aconfig_storage_file/Android.bp
View file

@ -56,7 +56,7 @@ rust_protobuf {
min_sdk_version: "29", min_sdk_version: "29",
} }
cc_library_static { cc_library {
name: "libaconfig_storage_protos_cc", name: "libaconfig_storage_protos_cc",
proto: { proto: {
export_proto_headers: true, export_proto_headers: true,

3
tools/aconfig/aconfig_storage_file/protos/aconfig_storage_metadata.proto
View file

@ -27,7 +27,8 @@ message storage_file_info {
optional string flag_map = 4; optional string flag_map = 4;
optional string flag_val = 5; optional string flag_val = 5;
optional string flag_info = 6; optional string flag_info = 6;
optional int64 timestamp = 7; optional string local_overrides = 7;
optional int64 timestamp = 8;
} }
message storage_files { message storage_files {

47
tools/aconfig/aconfig_storage_write_api/aconfig_storage_write_api.cpp
View file

@ -66,8 +66,31 @@ static Result<std::string> find_storage_file(
return Error() << "Unable to find storage files for container " << container; return Error() << "Unable to find storage files for container " << container;
} }
namespace private_internal_api {
/// Get mutable mapped file implementation.
Result<MutableMappedStorageFile> get_mutable_mapped_file_impl(
std::string const& pb_file,
std::string const& container,
StorageFileType file_type) {
if (file_type != StorageFileType::flag_val &&
file_type != StorageFileType::flag_info) {
return Error() << "Cannot create mutable mapped file for this file type";
}
auto file_result = find_storage_file(pb_file, container, file_type);
if (!file_result.ok()) {
return Error() << file_result.error();
}
return map_mutable_storage_file(*file_result);
}
} // namespace private internal api
/// Map a storage file /// Map a storage file
static Result<MutableMappedStorageFile> map_storage_file(std::string const& file) { Result<MutableMappedStorageFile> map_mutable_storage_file(std::string const& file) {
struct stat file_stat; struct stat file_stat;
if (stat(file.c_str(), &file_stat) < 0) { if (stat(file.c_str(), &file_stat) < 0) {
return ErrnoError() << "stat failed"; return ErrnoError() << "stat failed";
@ -97,28 +120,6 @@ static Result<MutableMappedStorageFile> map_storage_file(std::string const& file
return mapped_file; return mapped_file;
} }
namespace private_internal_api {
/// Get mutable mapped file implementation.
Result<MutableMappedStorageFile> get_mutable_mapped_file_impl(
std::string const& pb_file,
std::string const& container,
StorageFileType file_type) {
if (file_type != StorageFileType::flag_val &&
file_type != StorageFileType::flag_info) {
return Error() << "Cannot create mutable mapped file for this file type";
}
auto file_result = find_storage_file(pb_file, container, file_type);
if (!file_result.ok()) {
return Error() << file_result.error();
}
return map_storage_file(*file_result);
}
} // namespace private internal api
/// Get mutable mapped file /// Get mutable mapped file
Result<MutableMappedStorageFile> get_mutable_mapped_file( Result<MutableMappedStorageFile> get_mutable_mapped_file(
std::string const& container, std::string const& container,

4
tools/aconfig/aconfig_storage_write_api/include/aconfig_storage/aconfig_storage_write_api.hpp
View file

@ -26,6 +26,10 @@ Result<MutableMappedStorageFile> get_mutable_mapped_file_impl(
} // namespace private_internal_api } // namespace private_internal_api
/// Map a storage file
Result<MutableMappedStorageFile> map_mutable_storage_file(
std::string const& file);
/// Get mapped writeable storage file /// Get mapped writeable storage file
Result<MutableMappedStorageFile> get_mutable_mapped_file( Result<MutableMappedStorageFile> get_mutable_mapped_file(
std::string const& container, std::string const& container,