Use vndk_prop for old vndk properties am: 291d6b379d

Change-Id: I051e06e9b8f0a49bf8cf8b58e1f18f13ce4853a6
This commit is contained in:
Automerger Merge Worker 2020-01-17 03:26:47 +00:00
commit ab605560e5
5 changed files with 7 additions and 6 deletions

View File

@ -1206,7 +1206,9 @@
(typeattributeset exported_bluetooth_prop_29_0 (exported_bluetooth_prop))
(typeattributeset exported_config_prop_29_0 (exported_config_prop))
(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop))
(typeattributeset exported_default_prop_29_0 (exported_default_prop))
(typeattributeset exported_default_prop_29_0
( exported_default_prop
vndk_prop))
(typeattributeset exported_dumpstate_prop_29_0 (exported_dumpstate_prop))
(typeattributeset exported_ffs_prop_29_0 (exported_ffs_prop))
(typeattributeset exported_fingerprint_prop_29_0 (exported_fingerprint_prop))

View File

@ -76,5 +76,4 @@
vendor_boringssl_self_test
vendor_install_recovery
vendor_install_recovery_exec
vndk_prop
virtual_ab_prop))

View File

@ -66,7 +66,6 @@ system_restricted_prop(restorecon_prop)
system_restricted_prop(system_boot_reason_prop)
system_restricted_prop(system_jvmti_agent_prop)
system_restricted_prop(userspace_reboot_exported_prop)
system_restricted_prop(vndk_prop)
compatible_property_only(`
# DO NOT ADD ANY PROPERTIES HERE
@ -146,6 +145,7 @@ system_public_prop(system_prop)
system_public_prop(userspace_reboot_config_prop)
system_public_prop(vehicle_hal_prop)
system_public_prop(vendor_security_patch_level_prop)
system_public_prop(vndk_prop)
system_public_prop(wifi_log_prop)
system_public_prop(wifi_prop)

View File

@ -381,8 +381,8 @@ ro.vendor.build.date u:object_r:exported_default_prop:s0 exact string
ro.vendor.build.date.utc u:object_r:exported_default_prop:s0 exact int
ro.vendor.build.fingerprint u:object_r:exported_default_prop:s0 exact string
ro.vendor.build.version.incremental u:object_r:exported_default_prop:s0 exact string
ro.vndk.lite u:object_r:exported_default_prop:s0 exact bool
ro.vndk.version u:object_r:exported_default_prop:s0 exact string
ro.vndk.lite u:object_r:vndk_prop:s0 exact bool
ro.vndk.version u:object_r:vndk_prop:s0 exact string
ro.vts.coverage u:object_r:exported_default_prop:s0 exact int
wifi.active.interface u:object_r:exported_wifi_prop:s0 exact string
wifi.concurrent.interface u:object_r:exported_default_prop:s0 exact string

View File

@ -225,7 +225,6 @@ not_compatible_property(`
-module_sdkextensions_prop
-userspace_reboot_exported_prop
-userspace_reboot_prop
-vndk_prop
})
')
@ -262,6 +261,7 @@ set_prop(vendor_init, userspace_reboot_config_prop)
set_prop(vendor_init, vehicle_hal_prop)
set_prop(vendor_init, vendor_default_prop)
set_prop(vendor_init, vendor_security_patch_level_prop)
set_prop(vendor_init, vndk_prop)
set_prop(vendor_init, wifi_log_prop)
get_prop(vendor_init, exported2_radio_prop)