commit baacf2de454c274f04b69a0a002bf18a54b0b8b3
author bowgotsai <bowgotsai@google.com> Thu Feb 16 10:22:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 10:22:27 2017 +0000
tree 951918241b427663ca31514f5f637ef1ac43839e
parent cedc4e878c8db66dd45f58cd48724d2311744726
parent 34a418bc2171fc1a337c0a9e98503d290251561d

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

Change-Id: Idba5f257eb790e30ddb05384f495f1de38a92f0f

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 9c1e23b..7f7eb2f 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -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 @@
         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");