fs_mgr_get_entry_for_mount_point() is switching to a C++ only API (using
std::string). Do a minimum conversion here to adopt that change.
Bug:
67024518
Test: make and boot sailfish
Change-Id: I191fd0043815d75a799eb4001437abb107af6e79
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := boot_control_copy.c bootinfo.c
+LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp
LOCAL_CFLAGS := -Wall -Wno-missing-field-initializers -Wno-unused-parameter
LOCAL_C_INCLUDES := system/core/mkbootimg bootable/recovery
LOCAL_SHARED_LIBRARIES := libbase libcutils
}
trimmed_len = end_slash - record->blk_device + 1;
name_len = strlen(name);
- path = calloc(trimmed_len + name_len + 1, 1);
+ path = static_cast<char *>(calloc(trimmed_len + name_len + 1, 1));
strncpy(path, record->blk_device, trimmed_len);
strncpy(path + trimmed_len, name, name_len);
}