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;