diff options
author | Justin Yun <justinyun@google.com> | 2018-05-11 18:15:54 +0900 |
---|---|---|
committer | Justin Yun <justinyun@google.com> | 2018-05-14 15:33:41 +0900 |
commit | 4d865e6af86a2ee98be7063aaa28dd3b6c238068 (patch) | |
tree | b2ee3d96f916b58f88a5ac005664811091fe552d | |
parent | 9cafa9a1914322c31fd6bb8a672b0650b1a64add (diff) | |
download | device_google_wahoo-4d865e6af86a2ee98be7063aaa28dd3b6c238068.tar.gz device_google_wahoo-4d865e6af86a2ee98be7063aaa28dd3b6c238068.tar.bz2 device_google_wahoo-4d865e6af86a2ee98be7063aaa28dd3b6c238068.zip |
Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE for test
Setting PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE to true blocks
System-only-OTA from OMR1 devices because it does not allow some
propertis set by the OMR1 vendor partition.
Only if we include the VNDK snapshot v27 to wahoo devices, remove
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from wahoo as well as ag/3694012
for rild.
Bug: 74505580
Test: Check if Bluetooth could be turned on in P-OMR1 walleye device.
Change-Id: I5113988b10f0cdde394ed2fc31ebc9d1ea811e1c
-rwxr-xr-x | device.mk | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -14,7 +14,13 @@ # limitations under the License. # +ifneq (,$(filter 27, $(PRODUCT_EXTRA_VNDK_VERSIONS))) + _vndk_test := true +endif + +ifeq (,$(_vndk_test)) PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true +endif PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := true PRODUCT_PROPERTY_OVERRIDES += \ @@ -236,8 +242,15 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.radio.sib16_support=1 \ persist.radio.data_con_rprt=true \ persist.radio.always_send_plmn=false\ - persist.rcs.supported=1 \ + persist.rcs.supported=1 + +ifeq (,$(_vndk_test)) +PRODUCT_PROPERTY_OVERRIDES += \ vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so +else +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib64/libril-qc-qmi-1.so +endif # Disable snapshot timer PRODUCT_PROPERTY_OVERRIDES += \ |