From f3442d4a1b315e1bda937d14fee012a7b100e4f7 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Thu, 14 Jun 2018 05:51:42 -0600 Subject: [PATCH] klte-common: Rework shims * Recent binder changes caused our approach of shimming libcutils to re-add the non-inlined android_atomic* methods to start getting slapped, at least with NDK apps. This looks oddly similar to the heads-up we received in 7.0, so no clue why it let us do it in 8.* prior to now. * See: https://developer.android.com/about/versions/nougat/android-7.0-changes#ndk * We did this because all of the libsec-ril* blobs and libuiblur needed it and doing each and every libsec-ril seemed fragile and fraught with the potential for error, but "fragile and fraught with the potential for error" is better than "phone breaking". And blur doesn't seem to ever be coming back. * We'll leave the "standard" libsec-ril.so here and let the individual devices handle anything specific if they have variant- specific blobs Change-Id: Ib11048e4924f34ade20f44b707f0106e139f2f82 --- BoardConfigCommon.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 90e65fb..81f591a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -56,7 +56,9 @@ TARGET_KERNEL_SOURCE := kernel/samsung/msm8974 # Legacy BLOB Support TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS := true -TARGET_LD_SHIM_LIBS := /system/vendor/lib/hw/camera.vendor.msm8974.so|libshim_camera.so:/system/lib/libcutils.so|libshim_cutils_atomic.so +TARGET_LD_SHIM_LIBS += \ + /system/vendor/lib/hw/camera.vendor.msm8974.so|libshim_camera.so \ + /system/vendor/lib/libsec-ril.so|libshim_cutils_atomic.so # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 13631488