From cb22040c6303144a42a90f424f29a267e43bef74 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 23 Sep 2016 15:30:55 -0700
Subject: Switch to <android-base/properties.h>.

Bug: http://b/23102347
Test: boot into recovery.
Change-Id: Ib2ca560f1312961c21fbaa294bb068de19cb883e
Merged-In: Ib2ca560f1312961c21fbaa294bb068de19cb883e
---
 adb_install.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'adb_install.cpp')

diff --git a/adb_install.cpp b/adb_install.cpp
index b05fda13a..fab72f8a4 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -26,13 +26,14 @@
 #include <fcntl.h>
 
 #include "ui.h"
-#include "cutils/properties.h"
 #include "install.h"
 #include "common.h"
 #include "adb_install.h"
 #include "minadbd/fuse_adb_provider.h"
 #include "fuse_sideload.h"
 
+#include <android-base/properties.h>
+
 static void set_usb_driver(RecoveryUI* ui, bool enabled) {
     int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY);
     if (fd < 0) {
@@ -49,7 +50,7 @@ static void set_usb_driver(RecoveryUI* ui, bool enabled) {
 
 static void stop_adbd(RecoveryUI* ui) {
     ui->Print("Stopping adbd...\n");
-    property_set("ctl.stop", "adbd");
+    android::base::SetProperty("ctl.stop", "adbd");
     set_usb_driver(ui, false);
 }
 
@@ -57,7 +58,7 @@ static void maybe_restart_adbd(RecoveryUI* ui) {
     if (is_ro_debuggable()) {
         ui->Print("Restarting adbd...\n");
         set_usb_driver(ui, true);
-        property_set("ctl.start", "adbd");
+        android::base::SetProperty("ctl.start", "adbd");
     }
 }
 
-- 
cgit v1.2.3