diff --git a/device.mk b/device.mk
index fa2234b..59ecbc2 100644
--- a/device.mk
+++ b/device.mk
@@ -543,3 +543,7 @@ PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     $(DEVICE_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
     $(DEVICE_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
+
+# Engineering mode
+PRODUCT_PACKAGES += \
+    libjni_shim
diff --git a/extract-files.sh b/extract-files.sh
index 61fb7f8..565d5ad 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -67,6 +67,9 @@ function blob_fixup {
         vendor/bin/hw/android.hardware.wifi@1.0-service-lazy)
             "${PATCHELF}" --replace-needed "libwifi-hal.so" "libwifi-hal-mtk.so" "${2}"
             ;;
+        lib64/libem_support_jni.so)
+            "${PATCHELF}" --add-needed "libjni_shim.so" "${2}"
+            ;;
         vendor/bin/mnld)
             ;&
         vendor/lib64/libaalservice.so)
diff --git a/libshims/engineering_mode/Android.bp b/libshims/engineering_mode/Android.bp
new file mode 100644
index 0000000..e09707c
--- /dev/null
+++ b/libshims/engineering_mode/Android.bp
@@ -0,0 +1,4 @@
+cc_library_shared {
+    name: "libjni_shim",
+    srcs: ["libjni_shim.c"]
+}
diff --git a/libshims/engineering_mode/libjni_shim.c b/libshims/engineering_mode/libjni_shim.c
new file mode 100644
index 0000000..548ccf8
--- /dev/null
+++ b/libshims/engineering_mode/libjni_shim.c
@@ -0,0 +1 @@
+void _ZN7android21SurfaceComposerClient23getInternalDisplayTokenEv() {}