Merge "Add hypervisor version SysProp support"
diff --git a/srcs/Android.bp b/srcs/Android.bp
index 22e681d..9c098b0 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -32,4 +32,5 @@
     cpp: {
         min_sdk_version: "S",
     },
+    vendor_available: true,
 }
diff --git a/srcs/android/sysprop/HypervisorProperties.sysprop b/srcs/android/sysprop/HypervisorProperties.sysprop
new file mode 100644
index 0000000..000186c
--- /dev/null
+++ b/srcs/android/sysprop/HypervisorProperties.sysprop
@@ -0,0 +1,27 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+owner: Platform
+module: "android.sysprop.HypervisorProperties"
+
+# Provides a free-form description of the version of the hypervisor in use
+# that Android is running as a guest of, if any. Empty string on native
+# Android deployments, or if the information was not or could not be supplied.
+prop {
+    api_name: "hypervisor_version"
+    type: String
+    scope: Public
+    access: Readonly
+    prop_name: "ro.boot.hypervisor.version"
+}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index d6da8de..8a82387 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -17,6 +17,14 @@
   }
 }
 props {
+  module: "android.sysprop.HypervisorProperties"
+  prop {
+    api_name: "hypervisor_version"
+    type: String
+    prop_name: "ro.boot.hypervisor.version"
+  }
+}
+props {
   module: "android.sysprop.MediaProperties"
   prop {
     api_name: "codec2_dmabuf_padding"