Merge "aconfig: remove manual management of pointer" into main (221d1977) · Commits · e / os / android_build

tools/aconfig/aconfig/src/codegen/cpp.rs

+15 −24

Original line number	Diff line number	Diff line
		@@ -569,17 +569,17 @@ namespace com::android::aconfig::test {
		return;
		#endif

		auto package_map_file = aconfig_storage::get_mapped_file(
		auto package_map_file_ret = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::package_map);
		if (!package_map_file.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file.error().c_str());
		if (!package_map_file_ret.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file_ret.error().c_str());
		package_exists_in_storage_ = false;
		return;
		}

		std::unique_ptr<aconfig_storage::MappedStorageFile> package_map_file(*package_map_file_ret);
		auto context = aconfig_storage::get_package_read_context(
		**package_map_file, "com.android.aconfig.test");
		*package_map_file, "com.android.aconfig.test");
		if (!context.ok()) {
		ALOGE("error: failed to get package read context: %s", context.error().c_str());
		package_exists_in_storage_ = false;
		@@ -594,9 +594,6 @@ namespace com::android::aconfig::test {
		// cache package boolean flag start index
		boolean_start_index_ = context->boolean_start_index;

		// unmap package map file and free memory
		delete *package_map_file;

		auto flag_value_file = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::flag_val);
		@@ -802,17 +799,17 @@ namespace com::android::aconfig::test {
		return;
		#endif

		auto package_map_file = aconfig_storage::get_mapped_file(
		auto package_map_file_ret = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::package_map);
		if (!package_map_file.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file.error().c_str());
		if (!package_map_file_ret.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file_ret.error().c_str());
		package_exists_in_storage_ = false;
		return;
		}

		std::unique_ptr<aconfig_storage::MappedStorageFile> package_map_file(*package_map_file_ret);
		auto context = aconfig_storage::get_package_read_context(
		**package_map_file, "com.android.aconfig.test");
		*package_map_file, "com.android.aconfig.test");
		if (!context.ok()) {
		ALOGE("error: failed to get package read context: %s", context.error().c_str());
		package_exists_in_storage_ = false;
		@@ -833,9 +830,6 @@ namespace com::android::aconfig::test {
		// cache package boolean flag start index
		boolean_start_index_ = context->boolean_start_index;

		// unmap package map file and free memory
		delete *package_map_file;

		auto flag_value_file = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::flag_val);
		@@ -1070,18 +1064,18 @@ namespace com::android::aconfig::test {
		return;
		#endif

		auto package_map_file = aconfig_storage::get_mapped_file(
		auto package_map_file_ret = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::package_map);

		if (!package_map_file.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file.error().c_str());
		if (!package_map_file_ret.ok()) {
		ALOGE("error: failed to get package map file: %s", package_map_file_ret.error().c_str());
		package_exists_in_storage_ = false;
		return;
		}

		std::unique_ptr<aconfig_storage::MappedStorageFile> package_map_file(*package_map_file_ret);
		auto context = aconfig_storage::get_package_read_context(
		**package_map_file, "com.android.aconfig.test");
		*package_map_file, "com.android.aconfig.test");

		if (!context.ok()) {
		ALOGE("error: failed to get package read context: %s", context.error().c_str());
		@@ -1097,9 +1091,6 @@ namespace com::android::aconfig::test {
		// cache package boolean flag start index
		boolean_start_index_ = context->boolean_start_index;

		// unmap package map file and free memory
		delete *package_map_file;

		auto flag_value_file = aconfig_storage::get_mapped_file(
		"system",
		aconfig_storage::StorageFileType::flag_val);

tools/aconfig/aconfig/templates/cpp_source_file.template

+10 −16

Original line number	Diff line number	Diff line
		@@ -55,18 +55,18 @@ namespace {cpp_namespace} \{
		package_exists_in_storage_ = false;
		return;
		#endif
		auto package_map_file = aconfig_storage::get_mapped_file(
		auto package_map_file_ret = aconfig_storage::get_mapped_file(
		"{container}",
		aconfig_storage::StorageFileType::package_map);

		if (!package_map_file.ok()) \{
		ALOGE("error: failed to get package map file: %s", package_map_file.error().c_str());
		if (!package_map_file_ret.ok()) \{
		ALOGE("error: failed to get package map file: %s", package_map_file_ret.error().c_str());
		package_exists_in_storage_ = false;
		return;
		}

		std::unique_ptr<aconfig_storage::MappedStorageFile> package_map_file(*package_map_file_ret);
		auto context = aconfig_storage::get_package_read_context(
		**package_map_file, "{package}");
		*package_map_file, "{package}");

		if (!context.ok()) \{
		ALOGE("error: failed to get package read context: %s", context.error().c_str());
		@@ -90,9 +90,6 @@ namespace {cpp_namespace} \{
		// cache package boolean flag start index
		boolean_start_index_ = context->boolean_start_index;

		// unmap package map file and free memory
		delete *package_map_file;

		auto flag_value_file = aconfig_storage::get_mapped_file(
		"{container}",
		aconfig_storage::StorageFileType::flag_val);
		@@ -182,17 +179,17 @@ namespace {cpp_namespace} \{
		package_exists_in_storage_ = false;
		return;
		#endif
		auto package_map_file = aconfig_storage::get_mapped_file(
		auto package_map_file_ret = aconfig_storage::get_mapped_file(
		"{container}",
		aconfig_storage::StorageFileType::package_map);
		if (!package_map_file.ok()) \{
		ALOGE("error: failed to get package map file: %s", package_map_file.error().c_str());
		if (!package_map_file_ret.ok()) \{
		ALOGE("error: failed to get package map file: %s", package_map_file_ret.error().c_str());
		package_exists_in_storage_ = false;
		return;
		}

		std::unique_ptr<aconfig_storage::MappedStorageFile> package_map_file(*package_map_file_ret);
		auto context = aconfig_storage::get_package_read_context(
		**package_map_file, "{package}");
		*package_map_file, "{package}");
		if (!context.ok()) \{
		ALOGE("error: failed to get package read context: %s", context.error().c_str());
		package_exists_in_storage_ = false;
		@@ -215,9 +212,6 @@ namespace {cpp_namespace} \{
		// cache package boolean flag start index
		boolean_start_index_ = context->boolean_start_index;

		// unmap package map file and free memory
		delete *package_map_file;

		auto flag_value_file = aconfig_storage::get_mapped_file(
		"{container}",
		aconfig_storage::StorageFileType::flag_val);