Merge "Add vendor_available: true to libbuildverison" am: d2d8e322f1 am: f0f598bc17 am: 5d06a6576a am: f5af593465

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912416

Change-Id: I6f768fd2acab73fdb15a676adc97e4b5754cd52f

cc/libbuildversion/Android.bp

@@ -19,4 +19,5 @@ cc_library_static {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    vendor_available: true,
 }

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;