commit 6caa0fe2fc37f7496fa1ea1c3f15f2739358c540
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 09 18:05:16 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 09 18:05:16 2019 +0000
tree 9c17dc18a2af68949d756a68cb5cb054e663965d
parent 665677f91f13b92e8d76b8ce2fd9e530934a9335
parent bb604d7efdaa838a000247d3ae6fe710d9af3061

Merge "Refactor public_libraries.cpp more"

fs_mgr/fs_mgr_remount.cpp

diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index 00334bc..6482ed3 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -256,7 +256,7 @@
         auto& mount_point = entry.mount_point;
         if (fs_mgr_is_verity_enabled(entry)) {
             retval = VERITY_PARTITION;
-            if (android::base::GetProperty("ro.boot.vbmeta.devices_state", "") != "locked") {
+            if (android::base::GetProperty("ro.boot.vbmeta.device_state", "") != "locked") {
                 if (AvbOps* ops = avb_ops_user_new()) {
                     auto ret = avb_user_verity_set(
                             ops, android::base::GetProperty("ro.boot.slot_suffix", "").c_str(),

libprocessgroup/Android.bp

diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
index 78a02e5..0207a75 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -32,6 +32,8 @@
     shared_libs: [
         "libbase",
         "libcgrouprc",
+    ],
+    static_libs: [
         "libjsoncpp",
     ],
     // for cutils/android_filesystem_config.h