Merge "db845c: Install BT driver modules to ramdisk"
diff --git a/db845c/firmware/Android.mk b/db845c/firmware/Android.mk
index 8f5f09c..3af24e3 100644
--- a/db845c/firmware/Android.mk
+++ b/db845c/firmware/Android.mk
@@ -1,3 +1,5 @@
+ifneq ($(filter db845c, $(TARGET_BOARD_PLATFORM)),)
+
LOCAL_PATH := $(call my-dir)
include device/linaro/dragonboard/utils.mk
@@ -113,3 +115,4 @@
$(foreach f, $(ath10k_firmware_files), $(call add-qcom-firmware, $(f), $(TARGET_OUT_VENDOR)/firmware/ath10k/WCN3990/hw1.0/))
include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
diff --git a/init.common.rc b/init.common.rc
index 8b8f952..988a5e1 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -5,6 +5,10 @@
mount_all /vendor/etc/init/fstab.${ro.hardware}
swapon_all /vendor/etc/init/fstab.${ro.hardware}
+on post-fs
+ # set RLIMIT_MEMLOCK to 64MB
+ setrlimit 8 67108864 67108864
+
on init
# For legacy support
# See storage config details at http://source.android.com/tech/storage/
diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk
index aab118b..a6d53f0 100644
--- a/pixel3_mainline/device.mk
+++ b/pixel3_mainline/device.mk
@@ -28,3 +28,6 @@
# Build generic Audio HAL
PRODUCT_PACKAGES := audio.primary.pixel3_mainline
+
+# Copy firmware files
+$(call inherit-product-if-exists, $(LOCAL_PATH)/firmware/device.mk)