Merge "Set libavb version into system property for Treble OTA" am: b47a22337b

am: bfe7cf0e88

Change-Id: Idba5f257eb790e30ddb05384f495f1de38a92f0f
This commit is contained in:
bowgotsai 2017-02-16 10:22:27 +00:00 committed by android-build-merger
commit e8a04c4657

View file

@ -47,6 +47,7 @@
#include <cutils/iosched_policy.h>
#include <cutils/list.h>
#include <cutils/sockets.h>
#include <libavb/libavb.h>
#include <private/android_filesystem_config.h>
#include <fstream>
@ -959,6 +960,9 @@ int main(int argc, char** argv) {
property_set("ro.boottime.init", getenv("INIT_STARTED_AT"));
property_set("ro.boottime.init.selinux", getenv("INIT_SELINUX_TOOK"));
// Set libavb version for Framework-only OTA match in Treble build.
property_set("ro.boot.init.avb_version", std::to_string(AVB_MAJOR_VERSION).c_str());
// Clean up our environment.
unsetenv("INIT_SECOND_STAGE");
unsetenv("INIT_STARTED_AT");