commit eaeac57c56b91f9cd0d0dd9d8166fe4f0dc129fa
author David Anderson <dvander@google.com> Mon Apr 15 12:04:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 15 12:04:39 2019 -0700
tree d77207f9e4c01fe31a1a6cc3c55894dc44557d43
parent ace9154aeb768c5fa57811537ad4b2d449f729df
parent 3be1426fb3a22a343cfdd85d7598f90558b582b0

Merge "liblp: Use ro.boot.slot_suffix rather than ro.build.ab_update."
am: 2c561d18d8

Change-Id: Ib9189dec0c1d48e2d17648eaba93b0c7492fe150

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index 27222af..41c01da 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -1057,7 +1057,7 @@
     if (sABOverrideSet) {
         return sABOverrideValue;
     }
-    return android::base::GetBoolProperty("ro.build.ab_update", false);
+    return !android::base::GetProperty("ro.boot.slot_suffix", "").empty();
 }
 
 bool MetadataBuilder::IsRetrofitDevice() const {