commit 5afe96bb34146fb59d6142b132df33eb06c88f29
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 24 02:44:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 24 02:44:07 2020 +0000
tree aa525d1799351c667b50343e404b39f076209a58
parent 00176c716aff89bea2af99fb19d9b85cbb8c1784
parent b1e8c10159c62477e9f04deafb747200f788ceb5

Add C++ Host support on sysprop_library am: b1e8c10159

Change-Id: Ice0d029ae1bef6c6a8230916ce6857824d601e91

CppGen.cpp

diff --git a/CppGen.cpp b/CppGen.cpp
index 9c75eed..842bd5d 100644
--- a/CppGen.cpp
+++ b/CppGen.cpp
@@ -54,7 +54,15 @@
 #include <utility>
 
 #include <strings.h>
+#ifdef __BIONIC__
 #include <sys/system_properties.h>
+#else
+#include <android-base/properties.h>
+static int __system_property_set(const char* key, const char* value) {
+    android::base::SetProperty(key, value);
+    return 0;
+}
+#endif
 
 #include <android-base/parseint.h>
 #include <log/log.h>
@@ -184,6 +192,7 @@
 
 template <typename T>
 T GetProp(const char* key) {
+#ifdef __BIONIC__
     T ret;
     auto pi = __system_property_find(key);
     if (pi != nullptr) {
@@ -192,6 +201,9 @@
         }, &ret);
     }
     return ret;
+#else
+    return TryParse<T>(android::base::GetProperty(key, "").c_str());
+#endif
 }
 
 )";

tests/CppGenTest.cpp

diff --git a/tests/CppGenTest.cpp b/tests/CppGenTest.cpp
index 0d8c4f8..6fc6466 100644
--- a/tests/CppGenTest.cpp
+++ b/tests/CppGenTest.cpp
@@ -207,7 +207,15 @@
 #include <utility>
 
 #include <strings.h>
+#ifdef __BIONIC__
 #include <sys/system_properties.h>
+#else
+#include <android-base/properties.h>
+static int __system_property_set(const char* key, const char* value) {
+    android::base::SetProperty(key, value);
+    return 0;
+}
+#endif
 
 #include <android-base/parseint.h>
 #include <log/log.h>
@@ -398,6 +406,7 @@
 
 template <typename T>
 T GetProp(const char* key) {
+#ifdef __BIONIC__
     T ret;
     auto pi = __system_property_find(key);
     if (pi != nullptr) {
@@ -406,6 +415,9 @@
         }, &ret);
     }
     return ret;
+#else
+    return TryParse<T>(android::base::GetProperty(key, "").c_str());
+#endif
 }
 
 }  // namespace