Skip to content

Include the associated header from vendor_dlkm_utils.cc #1851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Dec 9, 2025
Merged

Include the associated header from vendor_dlkm_utils.cc #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ cf_cc_library(
"//cuttlefish/common/libs/utils:disk_usage",
"//cuttlefish/common/libs/utils:environment",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/common/libs/utils:result",
"//cuttlefish/common/libs/utils:subprocess",
"//cuttlefish/host/commands/assemble_cvd:boot_image_utils",
"//cuttlefish/host/commands/assemble_cvd:kernel_module_parser",
Expand Down
11 changes: 7 additions & 4 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h"

#include <fcntl.h>

#include <algorithm>
Expand Down Expand Up @@ -407,12 +409,13 @@ Result<void> RepackSuperWithPartition(const std::string& superimg_path,
return {};
}

Result<void> BuildVbmetaImage(const std::string& image_path,
Result<void> BuildVbmetaImage(const std::string& vendor_dlkm_img,
const std::string& vbmeta_path) {
CF_EXPECT(!image_path.empty());
CF_EXPECTF(FileExists(image_path), "'{}' does not exist", image_path);
CF_EXPECT(!vendor_dlkm_img.empty());
CF_EXPECTF(FileExists(vendor_dlkm_img), "'{}' does not exist",
vendor_dlkm_img);

CF_EXPECT(Avb().MakeVbMetaImage(vbmeta_path, {}, {image_path},
CF_EXPECT(Avb().MakeVbMetaImage(vbmeta_path, {}, {vendor_dlkm_img},
{"--padding_size", "4096"}));
return {};
}
Expand Down
3 changes: 0 additions & 3 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ Result<void> SplitRamdiskModules(const std::string& ramdisk_path,
const std::string& vendor_dlkm_build_dir,
const std::string& system_dlkm_build_dir);

Result<bool> WriteFsConfig(const char* output_path, const std::string& fs_root,
const std::string& mount_point);

Result<void> RepackSuperWithPartition(const std::string& superimg_path,
const std::string& image_path,
const std::string& partition_name);
Expand Down
Loading