From 763512795d8bdecae97962f2eadbc67624e40d32 Mon Sep 17 00:00:00 2001 From: bowgotsai Date: Tue, 14 Feb 2017 22:06:20 +0800 Subject: [PATCH] Set libavb version into system property for Treble OTA Treble allows framework-only (system.img) OTA. To libavb statically linked in init/fs_mgr cannot parse the AVB metadata of system.img, add this property for the Treble OTA match process. Bug: 35236019 Test: Normal boots, use 'adb shell getprop' to check the property is set. Test: Recovery boots, press 'Mount system' and use 'adb shell getprop' to check the property is set Change-Id: I552be229c4efd45088d93252ac67176606f75d4d --- init/init.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init/init.cpp b/init/init.cpp index 9c1e23bba..7f7eb2f00 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -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");