Merge "set ro.boottime.persistent_properties when persisted props are restored"

 * limitations under the License.

 */

#include <inttypes.h>

#include <stdio.h>

#include <stdlib.h>

#include <unistd.h>

#include <fs_mgr.h>

#include <android-base/file.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include "bootimg.h"

#include "util.h"

#include "log.h"

using android::base::StringPrintf;

#define PERSISTENT_PROPERTY_DIR  "/data/property"

#define FSTAB_PREFIX "/fstab."

#define RECOVERY_MOUNT_POINT "/recovery"

    load_override_properties();

    /* Read persistent properties after all default values have been loaded. */

    load_persistent_properties();

    uint64_t start_ns = boot_clock::now().time_since_epoch().count();

    property_set("ro.boottime.persistent_properties", StringPrintf("%" PRIu64, start_ns).c_str());

}

void load_recovery_id_prop() {