summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author A. Cody Schuffelen <schuffelen@google.com> 2021-12-06 16:20:24 -0800
committer A. Cody Schuffelen <schuffelen@google.com> 2021-12-06 22:08:40 -0800
commit580b93c3e85a1087e724cff85ee64394b2f82b37 (patch)
tree37ad93e03860f54087af3b868755a3302a34a4b1
parent2a7092927cdd5c05e5826d0735d3cf2d68014fcf (diff)
Add `vendor_available: true` to libbuildverison
This allows using libbuildversion in Cuttlefish, which builds many binaries for both vendor and host. On vendor executables, this gets the build id from the ro.vendor.build.version.incremental property. Bug: 206843934 Test: m -j Change-Id: I9ab11b42de3f1febf282f107c3e137592097d3c0
-rw-r--r--cc/libbuildversion/Android.bp1
-rw-r--r--cc/libbuildversion/libbuildversion.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/cc/libbuildversion/Android.bp b/cc/libbuildversion/Android.bp
index 2cff99435..b105a3029 100644
--- a/cc/libbuildversion/Android.bp
+++ b/cc/libbuildversion/Android.bp
@@ -19,4 +19,5 @@ cc_library_static {
"//apex_available:platform",
"//apex_available:anyapex",
],
+ vendor_available: true,
}
diff --git a/cc/libbuildversion/libbuildversion.cpp b/cc/libbuildversion/libbuildversion.cpp
index 5242025eb..1e01c1145 100644
--- a/cc/libbuildversion/libbuildversion.cpp
+++ b/cc/libbuildversion/libbuildversion.cpp
@@ -36,7 +36,11 @@ std::string GetBuildNumber() {
return soong_build_number;
}
+#ifdef __ANDROID_VENDOR__
+ const prop_info* pi = __system_property_find("ro.vendor.build.version.incremental");
+#else
const prop_info* pi = __system_property_find("ro.build.version.incremental");
+#endif
if (pi == nullptr) return "";
std::string property_value;