commit 497e3e05a5bf7f58c9e8f44896a6869df63f053d
author Elliott Hughes <enh@google.com> Mon Oct 09 22:18:08 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Mon Oct 09 23:57:48 2023 +0000
tree c89d77fc81263c8035f208d93bc6ea31ae7cb0c4
parent fcea70f840f36eefdd8550f9b4ed4ead099844cc

Use libbase properties for a slight simplification.

Test: treehugger
Change-Id: If699230d0bf71ce521d7175da707e42b78ae4886

netbpfload/loader.cpp

diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp
index 82ce6d5..9aeb184 100644
--- a/netbpfload/loader.cpp
+++ b/netbpfload/loader.cpp
@@ -59,9 +59,9 @@
 
 #include <android-base/cmsg.h>
 #include <android-base/file.h>
+#include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
-#include <cutils/properties.h>
 
 #define BPF_FS_PATH "/sys/fs/bpf/"
 
@@ -79,17 +79,11 @@
 using std::string;
 using std::vector;
 
-static std::string getBuildTypeInternal() {
-    char value[PROPERTY_VALUE_MAX] = {};
-    (void)property_get("ro.build.type", value, "unknown");  // ignore length
-    return value;
-}
-
 namespace android {
 namespace bpf {
 
 const std::string& getBuildType() {
-    static std::string t = getBuildTypeInternal();
+    static std::string t = android::base::GetProperty("ro.build.type", "unknown");
     return t;
 }