diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 0a1531a63..543353007 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -62,4 +62,4 @@ BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy - +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/target/board/generic/system.prop b/target/board/generic/system.prop index f2424c970..ad8e5b806 100644 --- a/target/board/generic/system.prop +++ b/target/board/generic/system.prop @@ -2,5 +2,4 @@ # system.prop for generic sdk # -rild.libpath=/system/lib/libreference-ril.so -rild.libargs=-d /dev/ttyS0 +rild.libpath=/vendor/lib/libreference-ril.so diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 6d5ae5190..e5c967194 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -92,4 +92,5 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy diff --git a/target/board/generic_arm64/system.prop b/target/board/generic_arm64/system.prop index 24578a9e3..5b0183a37 100644 --- a/target/board/generic_arm64/system.prop +++ b/target/board/generic_arm64/system.prop @@ -2,5 +2,4 @@ # system.prop for generic arm64 sdk # -rild.libpath=/system/lib64/libreference-ril.so -rild.libargs=-d /dev/ttyS0 +rild.libpath=/vendor/lib64/libreference-ril.so diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 08d12b3a2..bb5c0b63b 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -42,6 +42,7 @@ TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 TARGET_COPY_OUT_VENDOR := vendor +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true # ~100 MB vendor image. Please adjust system image / vendor image sizes # when finalizing them. BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000 diff --git a/target/board/generic_x86/system.prop b/target/board/generic_x86/system.prop index 137a0f9b1..64829f3ce 100644 --- a/target/board/generic_x86/system.prop +++ b/target/board/generic_x86/system.prop @@ -2,5 +2,4 @@ # system.prop for generic sdk # -rild.libpath=/system/lib/libreference-ril.so -rild.libargs=-d /dev/ttyS0 +rild.libpath=/vendor/lib/libreference-ril.so diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index d07a14da7..0782bd09c 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -53,6 +53,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true BOARD_SEPOLICY_DIRS += \ build/target/board/generic/sepolicy \ diff --git a/target/board/generic_x86_64/system.prop b/target/board/generic_x86_64/system.prop index 43d4a88fa..ed9d1731c 100644 --- a/target/board/generic_x86_64/system.prop +++ b/target/board/generic_x86_64/system.prop @@ -2,5 +2,4 @@ # system.prop for generic sdk # -rild.libpath=/system/lib64/libreference-ril.so -rild.libargs=-d /dev/ttyS0 +rild.libpath=/vendor/lib64/libreference-ril.so diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index 3bab84d45..599673ae5 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -14,6 +14,9 @@ # limitations under the License. # +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib64/libreference-ril.so + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index 910692f92..e99f0f5b4 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -14,6 +14,9 @@ # limitations under the License. # +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib/libreference-ril.so + # Note: the following lines need to stay at the beginning so that it can # take priority and override the rules it inherit from other mk files # see copy file rules in core/Makefile diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 90f4e164b..1e827732f 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -14,6 +14,9 @@ # limitations under the License. # +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib/libreference-ril.so + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 63e684337..a18c4f886 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -14,6 +14,9 @@ # limitations under the License. # +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib64/libreference-ril.so + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be