diff --git a/Android.bp b/Android.bp index 1e22285..18303d3 100644 --- a/Android.bp +++ b/Android.bp @@ -5,88 +5,6 @@ soong_namespace { } -android_app_import { - name: "QtiTelephonyService", - owner: "google", - apk: "proprietary/app/QtiTelephonyService/QtiTelephonyService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "atfwd", - owner: "google", - apk: "proprietary/app/atfwd/atfwd.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "ims", - owner: "google", - apk: "proprietary/app/ims/ims.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "uceShimService", - owner: "google", - apk: "proprietary/app/uceShimService/uceShimService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "uimremoteclient", - owner: "google", - apk: "proprietary/app/uimremoteclient/uimremoteclient.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "uimremoteserver", - owner: "google", - apk: "proprietary/app/uimremoteserver/uimremoteserver.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, -} - -android_app_import { - name: "CNEService", - owner: "google", - apk: "proprietary/priv-app/CNEService/CNEService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, -} - -android_app_import { - name: "qcrilmsgtunnel", - owner: "google", - apk: "proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, -} - android_app_import { name: "MobileFeliCaClient", owner: "google", @@ -165,9 +83,20 @@ android_app_import { } android_app_import { - name: "com.qualcomm.qti.services.secureui", + name: "uimremoteclient", owner: "google", - apk: "proprietary/product/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk", + apk: "proprietary/product/app/uimremoteclient/uimremoteclient.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "uimremoteserver", + owner: "google", + apk: "proprietary/product/app/uimremoteserver/uimremoteserver.apk", certificate: "platform", dex_preopt: { enabled: false, @@ -427,6 +356,85 @@ android_app_import { product_specific: true, } +android_app_import { + name: "com.qualcomm.qti.services.secureui", + owner: "google", + apk: "proprietary/system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, +} + +android_app_import { + name: "QtiTelephonyService", + owner: "google", + apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, +} + +android_app_import { + name: "atfwd", + owner: "google", + apk: "proprietary/system_ext/app/atfwd/atfwd.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, +} + +android_app_import { + name: "ims", + owner: "google", + apk: "proprietary/system_ext/app/ims/ims.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, +} + +android_app_import { + name: "uceShimService", + owner: "google", + apk: "proprietary/system_ext/app/uceShimService/uceShimService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, +} + +android_app_import { + name: "CNEService", + owner: "google", + apk: "proprietary/system_ext/priv-app/CNEService/CNEService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + +android_app_import { + name: "qcrilmsgtunnel", + owner: "google", + apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + android_app_import { name: "CarrierSetup", owner: "google", @@ -524,28 +532,31 @@ android_app_import { } dex_import { - name: "qcrilhook", + name: "libhwinfo", owner: "google", - jars: ["proprietary/framework/qcrilhook.jar"], + jars: ["proprietary/product/framework/libhwinfo.jar"], + product_specific: true, } dex_import { name: "uimremoteclientlibrary", owner: "google", - jars: ["proprietary/framework/uimremoteclientlibrary.jar"], + jars: ["proprietary/product/framework/uimremoteclientlibrary.jar"], + product_specific: true, } dex_import { name: "uimremoteserverlibrary", owner: "google", - jars: ["proprietary/framework/uimremoteserverlibrary.jar"], + jars: ["proprietary/product/framework/uimremoteserverlibrary.jar"], + product_specific: true, } dex_import { - name: "libhwinfo", + name: "qcrilhook", owner: "google", - jars: ["proprietary/product/framework/libhwinfo.jar"], - product_specific: true, + jars: ["proprietary/system_ext/framework/qcrilhook.jar"], + system_ext_specific: true, } dex_import { diff --git a/bonito-vendor.mk b/bonito-vendor.mk index ffc9b9d..4cf315f 100644 --- a/bonito-vendor.mk +++ b/bonito-vendor.mk @@ -6,24 +6,10 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google/bonito PRODUCT_COPY_FILES += \ - vendor/google/bonito/proprietary/etc/cne/andsfCne.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/andsfCne.xml \ - vendor/google/bonito/proprietary/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \ - vendor/google/bonito/proprietary/etc/permissions/com.quicinc.cne.CNEService.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.quicinc.cne.CNEService.xml \ - vendor/google/bonito/proprietary/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qcrilhook.xml \ - vendor/google/bonito/proprietary/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/uimremoteclient.xml \ - vendor/google/bonito/proprietary/etc/permissions/uimremoteserver.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/uimremoteserver.xml \ - vendor/google/bonito/proprietary/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvideocodec.so \ - vendor/google/bonito/proprietary/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvt.so \ - vendor/google/bonito/proprietary/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtextutils.so \ - vendor/google/bonito/proprietary/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtutils.so \ - vendor/google/bonito/proprietary/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimscamera_jni.so \ - vendor/google/bonito/proprietary/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimsmedia_jni.so \ - vendor/google/bonito/proprietary/lib64/librcc.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/librcc.so \ - vendor/google/bonito/proprietary/lib64/libsecureui_svcsock_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libsecureui_svcsock_system.so \ vendor/google/bonito/proprietary/product/etc/ambient/matcher_tah.leveldb:$(TARGET_COPY_OUT_PRODUCT)/etc/ambient/matcher_tah.leveldb \ - vendor/google/bonito/proprietary/product/etc/cne/Nexus/ATT/ATT_profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/cne/Nexus/ATT/ATT_profiles.xml \ - vendor/google/bonito/proprietary/product/etc/cne/Nexus/ROW/ROW_profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/cne/Nexus/ROW/ROW_profiles.xml \ - vendor/google/bonito/proprietary/product/etc/cne/Nexus/VZW/VZW_profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/cne/Nexus/VZW/VZW_profiles.xml \ + vendor/google/bonito/proprietary/system_ext/etc/cne/Nexus/ATT/ATT_profiles.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cne/Nexus/ATT/ATT_profiles.xml \ + vendor/google/bonito/proprietary/system_ext/etc/cne/Nexus/ROW/ROW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cne/Nexus/ROW/ROW_profiles.xml \ + vendor/google/bonito/proprietary/system_ext/etc/cne/Nexus/VZW/VZW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cne/Nexus/VZW/VZW_profiles.xml \ vendor/google/bonito/proprietary/product/etc/felica/common.cfg:$(TARGET_COPY_OUT_PRODUCT)/etc/felica/common.cfg \ vendor/google/bonito/proprietary/product/etc/felica/mfm.cfg:$(TARGET_COPY_OUT_PRODUCT)/etc/felica/mfm.cfg \ vendor/google/bonito/proprietary/product/etc/felica/mfs.cfg:$(TARGET_COPY_OUT_PRODUCT)/etc/felica/mfs.cfg \ @@ -50,7 +36,20 @@ PRODUCT_COPY_FILES += \ vendor/google/bonito/proprietary/product/etc/sysconfig/pixel_experience_2019_midyear.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_experience_2019_midyear.xml \ vendor/google/bonito/proprietary/product/lib/libdmengine.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libdmengine.so \ vendor/google/bonito/proprietary/product/lib/libdmjavaplugin.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libdmjavaplugin.so \ - vendor/google/bonito/proprietary/product/lib64/libsecureuisvc_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libsecureuisvc_jni.so \ + vendor/google/bonito/proprietary/system_ext/etc/cne/andsfCne.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cne/andsfCne.xml \ + vendor/google/bonito/proprietary/system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \ + vendor/google/bonito/proprietary/system_ext/etc/permissions/com.quicinc.cne.CNEService.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.quicinc.cne.CNEService.xml \ + vendor/google/bonito/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \ + vendor/google/bonito/proprietary/product/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/uimremoteclient.xml \ + vendor/google/bonito/proprietary/product/etc/permissions/uimremoteserver.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/uimremoteserver.xml \ + vendor/google/bonito/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \ + vendor/google/bonito/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \ + vendor/google/bonito/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \ + vendor/google/bonito/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \ + vendor/google/bonito/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \ + vendor/google/bonito/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \ + vendor/google/bonito/proprietary/system_ext/lib64/librcc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/librcc.so \ + vendor/google/bonito/proprietary/system_ext/lib64/libsecureui_svcsock_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsecureui_svcsock_system.so \ vendor/google/bonito/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \ vendor/google/bonito/proprietary/system_ext/etc/permissions/com.android.omadm.radioconfig.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.omadm.radioconfig.xml \ vendor/google/bonito/proprietary/system_ext/etc/permissions/com.google.android.camera.extensions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.google.android.camera.extensions.xml \ @@ -61,19 +60,12 @@ PRODUCT_COPY_FILES += \ vendor/google/bonito/proprietary/system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se-lineage.xml \ vendor/google/bonito/proprietary/system_ext/etc/permissions/vzw_mvs_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vzw_mvs_permissions.xml \ vendor/google/bonito/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \ + vendor/google/bonito/proprietary/system_ext/lib64/libsecureuisvc_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsecureuisvc_jni.so \ vendor/google/bonito/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@1.0.so \ vendor/google/bonito/proprietary/system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img:$(TARGET_COPY_OUT_SYSTEM_EXT)/priv-app/EuiccSupportPixel/esim-full-v0.img \ vendor/google/bonito/proprietary/system_ext/priv-app/EuiccSupportPixel/esim-v1.img:$(TARGET_COPY_OUT_SYSTEM_EXT)/priv-app/EuiccSupportPixel/esim-v1.img PRODUCT_PACKAGES += \ - QtiTelephonyService \ - atfwd \ - ims \ - uceShimService \ - uimremoteclient \ - uimremoteserver \ - CNEService \ - qcrilmsgtunnel \ MobileFeliCaClient \ MobileFeliCaMenuMainApp \ MobileFeliCaSettingApp \ @@ -81,7 +73,8 @@ PRODUCT_PACKAGES += \ MobileFeliCaWebPluginBoot \ PixelCameraServicesBonito \ VZWAPNLib \ - com.qualcomm.qti.services.secureui \ + uimremoteclient \ + uimremoteserver \ AmbientSensePrebuilt \ AppDirectedSMSService \ CarrierServices \ @@ -103,6 +96,13 @@ PRODUCT_PACKAGES += \ TetheringEntitlement \ USCCDM \ WfcActivation \ + com.qualcomm.qti.services.secureui \ + QtiTelephonyService \ + atfwd \ + ims \ + uceShimService \ + CNEService \ + qcrilmsgtunnel \ CarrierSetup \ EuiccSupportPixel \ EuiccSupportPixelPermissions \ @@ -111,10 +111,10 @@ PRODUCT_PACKAGES += \ RilConfigService \ grilservice \ obdm_stub \ - qcrilhook \ + libhwinfo \ uimremoteclientlibrary \ uimremoteserverlibrary \ - libhwinfo \ + qcrilhook \ RadioConfigLib \ com.android.hotwordenrollment.common.util \ com.google.android.camera.extensions \ diff --git a/proprietary/app/uimremoteclient/uimremoteclient.apk b/proprietary/product/app/uimremoteclient/uimremoteclient.apk similarity index 100% rename from proprietary/app/uimremoteclient/uimremoteclient.apk rename to proprietary/product/app/uimremoteclient/uimremoteclient.apk diff --git a/proprietary/app/uimremoteserver/uimremoteserver.apk b/proprietary/product/app/uimremoteserver/uimremoteserver.apk similarity index 100% rename from proprietary/app/uimremoteserver/uimremoteserver.apk rename to proprietary/product/app/uimremoteserver/uimremoteserver.apk diff --git a/proprietary/etc/permissions/uimremoteclient.xml b/proprietary/product/etc/permissions/uimremoteclient.xml similarity index 79% rename from proprietary/etc/permissions/uimremoteclient.xml rename to proprietary/product/etc/permissions/uimremoteclient.xml index 059d126..155f292 100644 --- a/proprietary/etc/permissions/uimremoteclient.xml +++ b/proprietary/product/etc/permissions/uimremoteclient.xml @@ -6,5 +6,5 @@ + file="/product/framework/uimremoteclientlibrary.jar"/> diff --git a/proprietary/etc/permissions/uimremoteserver.xml b/proprietary/product/etc/permissions/uimremoteserver.xml similarity index 79% rename from proprietary/etc/permissions/uimremoteserver.xml rename to proprietary/product/etc/permissions/uimremoteserver.xml index 1697a9d..fd8b661 100644 --- a/proprietary/etc/permissions/uimremoteserver.xml +++ b/proprietary/product/etc/permissions/uimremoteserver.xml @@ -7,5 +7,5 @@ + file="/product/framework/uimremoteserverlibrary.jar"/> diff --git a/proprietary/framework/uimremoteclientlibrary.jar b/proprietary/product/framework/uimremoteclientlibrary.jar similarity index 100% rename from proprietary/framework/uimremoteclientlibrary.jar rename to proprietary/product/framework/uimremoteclientlibrary.jar diff --git a/proprietary/framework/uimremoteserverlibrary.jar b/proprietary/product/framework/uimremoteserverlibrary.jar similarity index 100% rename from proprietary/framework/uimremoteserverlibrary.jar rename to proprietary/product/framework/uimremoteserverlibrary.jar diff --git a/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk similarity index 100% rename from proprietary/app/QtiTelephonyService/QtiTelephonyService.apk rename to proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk diff --git a/proprietary/app/atfwd/atfwd.apk b/proprietary/system_ext/app/atfwd/atfwd.apk similarity index 100% rename from proprietary/app/atfwd/atfwd.apk rename to proprietary/system_ext/app/atfwd/atfwd.apk diff --git a/proprietary/product/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk b/proprietary/system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk similarity index 100% rename from proprietary/product/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk rename to proprietary/system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk diff --git a/proprietary/app/ims/ims.apk b/proprietary/system_ext/app/ims/ims.apk similarity index 100% rename from proprietary/app/ims/ims.apk rename to proprietary/system_ext/app/ims/ims.apk diff --git a/proprietary/app/uceShimService/uceShimService.apk b/proprietary/system_ext/app/uceShimService/uceShimService.apk similarity index 100% rename from proprietary/app/uceShimService/uceShimService.apk rename to proprietary/system_ext/app/uceShimService/uceShimService.apk diff --git a/proprietary/product/etc/cne/Nexus/ATT/ATT_profiles.xml b/proprietary/system_ext/etc/cne/Nexus/ATT/ATT_profiles.xml similarity index 100% rename from proprietary/product/etc/cne/Nexus/ATT/ATT_profiles.xml rename to proprietary/system_ext/etc/cne/Nexus/ATT/ATT_profiles.xml diff --git a/proprietary/product/etc/cne/Nexus/ROW/ROW_profiles.xml b/proprietary/system_ext/etc/cne/Nexus/ROW/ROW_profiles.xml similarity index 100% rename from proprietary/product/etc/cne/Nexus/ROW/ROW_profiles.xml rename to proprietary/system_ext/etc/cne/Nexus/ROW/ROW_profiles.xml diff --git a/proprietary/product/etc/cne/Nexus/VZW/VZW_profiles.xml b/proprietary/system_ext/etc/cne/Nexus/VZW/VZW_profiles.xml similarity index 100% rename from proprietary/product/etc/cne/Nexus/VZW/VZW_profiles.xml rename to proprietary/system_ext/etc/cne/Nexus/VZW/VZW_profiles.xml diff --git a/proprietary/etc/cne/andsfCne.xml b/proprietary/system_ext/etc/cne/andsfCne.xml similarity index 100% rename from proprietary/etc/cne/andsfCne.xml rename to proprietary/system_ext/etc/cne/andsfCne.xml diff --git a/proprietary/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml b/proprietary/system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml similarity index 100% rename from proprietary/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml rename to proprietary/system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml diff --git a/proprietary/etc/permissions/com.quicinc.cne.CNEService.xml b/proprietary/system_ext/etc/permissions/com.quicinc.cne.CNEService.xml similarity index 100% rename from proprietary/etc/permissions/com.quicinc.cne.CNEService.xml rename to proprietary/system_ext/etc/permissions/com.quicinc.cne.CNEService.xml diff --git a/proprietary/etc/permissions/qcrilhook.xml b/proprietary/system_ext/etc/permissions/qcrilhook.xml similarity index 66% rename from proprietary/etc/permissions/qcrilhook.xml rename to proprietary/system_ext/etc/permissions/qcrilhook.xml index 6ca9c57..b95d847 100644 --- a/proprietary/etc/permissions/qcrilhook.xml +++ b/proprietary/system_ext/etc/permissions/qcrilhook.xml @@ -1,5 +1,5 @@ + file="/system_ext/framework/qcrilhook.jar"/> diff --git a/proprietary/framework/qcrilhook.jar b/proprietary/system_ext/framework/qcrilhook.jar similarity index 100% rename from proprietary/framework/qcrilhook.jar rename to proprietary/system_ext/framework/qcrilhook.jar diff --git a/proprietary/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so similarity index 100% rename from proprietary/lib64/lib-imsvideocodec.so rename to proprietary/system_ext/lib64/lib-imsvideocodec.so diff --git a/proprietary/lib64/lib-imsvt.so b/proprietary/system_ext/lib64/lib-imsvt.so similarity index 100% rename from proprietary/lib64/lib-imsvt.so rename to proprietary/system_ext/lib64/lib-imsvt.so diff --git a/proprietary/lib64/lib-imsvtextutils.so b/proprietary/system_ext/lib64/lib-imsvtextutils.so similarity index 100% rename from proprietary/lib64/lib-imsvtextutils.so rename to proprietary/system_ext/lib64/lib-imsvtextutils.so diff --git a/proprietary/lib64/lib-imsvtutils.so b/proprietary/system_ext/lib64/lib-imsvtutils.so similarity index 100% rename from proprietary/lib64/lib-imsvtutils.so rename to proprietary/system_ext/lib64/lib-imsvtutils.so diff --git a/proprietary/lib64/libimscamera_jni.so b/proprietary/system_ext/lib64/libimscamera_jni.so similarity index 100% rename from proprietary/lib64/libimscamera_jni.so rename to proprietary/system_ext/lib64/libimscamera_jni.so diff --git a/proprietary/lib64/libimsmedia_jni.so b/proprietary/system_ext/lib64/libimsmedia_jni.so similarity index 100% rename from proprietary/lib64/libimsmedia_jni.so rename to proprietary/system_ext/lib64/libimsmedia_jni.so diff --git a/proprietary/lib64/librcc.so b/proprietary/system_ext/lib64/librcc.so similarity index 100% rename from proprietary/lib64/librcc.so rename to proprietary/system_ext/lib64/librcc.so diff --git a/proprietary/lib64/libsecureui_svcsock_system.so b/proprietary/system_ext/lib64/libsecureui_svcsock_system.so similarity index 100% rename from proprietary/lib64/libsecureui_svcsock_system.so rename to proprietary/system_ext/lib64/libsecureui_svcsock_system.so diff --git a/proprietary/product/lib64/libsecureuisvc_jni.so b/proprietary/system_ext/lib64/libsecureuisvc_jni.so similarity index 100% rename from proprietary/product/lib64/libsecureuisvc_jni.so rename to proprietary/system_ext/lib64/libsecureuisvc_jni.so diff --git a/proprietary/priv-app/CNEService/CNEService.apk b/proprietary/system_ext/priv-app/CNEService/CNEService.apk similarity index 100% rename from proprietary/priv-app/CNEService/CNEService.apk rename to proprietary/system_ext/priv-app/CNEService/CNEService.apk diff --git a/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk similarity index 100% rename from proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk rename to proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk