summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-03 07:36:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-03 07:36:49 +0000
commit13b8f7144cc12d33f2b607d4ed2e5d1798c94414 (patch)
treed836efd7a29ca6288b3e128650f358b182fc9d6a
parenta24b4a080cb949a51afd1184c825eb7e369549a6 (diff)
parent4064a736a704204257597a5c6e56769a8951cb13 (diff)
downloadlibsysprop-13b8f7144cc12d33f2b607d4ed2e5d1798c94414.tar.gz
Define VNDK version properties in PlatformProperties am: a84edd9e99 am: 4064a736a7
Change-Id: I40ba23ec15c75535fc2251d504f2e7758ea77044
-rw-r--r--srcs/android/sysprop/VndkProperties.sysprop (renamed from srcs/android/sysprop/ProductProperties.sysprop)21
-rw-r--r--srcs/api/PlatformProperties-current.txt21
2 files changed, 29 insertions, 13 deletions
diff --git a/srcs/android/sysprop/ProductProperties.sysprop b/srcs/android/sysprop/VndkProperties.sysprop
index 72a5520..8898fa2 100644
--- a/srcs/android/sysprop/ProductProperties.sysprop
+++ b/srcs/android/sysprop/VndkProperties.sysprop
@@ -12,12 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-module: "android.sysprop.ProductProperties"
+module: "android.sysprop.VndkProperties"
owner: Platform
+
+# VNDK version for vendor partition
+prop {
+ api_name: "vendor_vndk_version"
+ type: String
+ scope: Public
+ access: Readonly
+ prop_name: "ro.vndk.version"
+}
+
+# VNDK version for product partition
prop {
- api_name: "unbundled_apps"
- type: Boolean
- scope: Internal
+ api_name: "product_vndk_version"
+ type: String
+ scope: Public
access: Readonly
- prop_name: "ro.product.apps.unbundled"
+ prop_name: "ro.product.vndk.version"
}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index 5f8b089..5ee7609 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -138,14 +138,6 @@ props {
}
}
props {
- module: "android.sysprop.ProductProperties"
- prop {
- api_name: "unbundled_apps"
- scope: Internal
- prop_name: "ro.product.apps.unbundled"
- }
-}
-props {
module: "android.sysprop.SetupWizardProperties"
prop {
api_name: "esim_cid_ignore"
@@ -408,6 +400,19 @@ props {
}
}
props {
+ module: "android.sysprop.VndkProperties"
+ prop {
+ api_name: "product_vndk_version"
+ type: String
+ prop_name: "ro.product.vndk.version"
+ }
+ prop {
+ api_name: "vendor_vndk_version"
+ type: String
+ prop_name: "ro.vndk.version"
+ }
+}
+props {
module: "android.sysprop.VoldProperties"
prop {
api_name: "decrypt"