marlin: embed libimscamera_jni and libimsmedia_jni into ims.apk
By embedding the jni libs into the apk, we can avoid the link type check
error which prevents dependency to libnativehelper and libgui from the
jni libs.
Bug: 37481404
Test: no libimscamera_jni.so and libimsmedia_jni.so installed. They are
instead found inside ims.apk (unzip -l vendor/app/ims/ims.apk)
Change-Id: Ibf96057d1b63b6870ba44fa6fe8b7174b17c358c
diff --git a/common/base.mk b/common/base.mk
index 1c7bcc9..e97ff14 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -611,7 +611,6 @@
#VT_JNI
VT_JNI := libvt_jni
-VT_JNI += libimscamera_jni
# VT QTI Permissions
VT_QTI_PERMISSIONS := qti_permissions.xml
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 207c05e..984e3f1 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -165,14 +165,6 @@
/vendor/lib(64)?/libhalide_hexagon_host\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libadsprpc\.so u:object_r:same_process_hal_file:s0
-################################################
-# Treble violations to be fixed
-#
-# TODO: b/36806861
-/vendor/lib(64)?/libimsmedia_jni\.so u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libimscamera_jni\.so u:object_r:same_process_hal_file:s0
-
-
# Misc files on /vendor
/vendor/usr/idc(/.*)? u:object_r:idc_file:s0
