commit 3b0811b78641fe2ce10da1be8d7481f3080426bf
author Elliott Hughes <enh@google.com> Mon Oct 09 22:20:04 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Tue Oct 10 02:30:40 2023 +0000
tree b0015d7cba4a53a1df18986adb78264bd4d16350
parent 0d1d07c1b0602bcc548d7e7be5173dcf42084a6d

Use libbase properties for a slight simplification.

Test: treehugger
Change-Id: I78f7fb43665640cd6869bfde217f60f19bf0cfa1

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index d817614..e817a59 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/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;
 }