Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,20 @@ dex_import {
system_ext_specific: true,
}

install_symlink {
name: "libimscamera_jni_libimscamera_jni_symlink64",
system_ext_specific: true,
installed_location: "priv-app/ims/lib/arm64/libimscamera_jni.so",
symlink_target: "/system_ext/lib64/libimscamera_jni.so",
}

install_symlink {
name: "libimsmedia_jni_libimsmedia_jni_symlink64",
system_ext_specific: true,
installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so",
symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
}

android_app_import {
name: "CACertService",
owner: "sony",
Expand All @@ -437,6 +451,7 @@ android_app_import {
name: "CneApp",
owner: "sony",
apk: "proprietary/vendor/app/CneApp/CneApp.apk",
required: ["CneApp.libvndfwk_detect_jni.qti_symlink"],
certificate: "platform",
dex_preopt: {
enabled: false,
Expand All @@ -455,3 +470,45 @@ android_app_import {
soc_specific: true,
}

install_symlink {
name: "libEGL_adreno_libEGL_adreno_symlink32",
soc_specific: true,
installed_location: "lib/libEGL_adreno.so",
symlink_target: "/vendor/lib/egl/libEGL_adreno.so",
}

install_symlink {
name: "libGLESv2_adreno_libGLESv2_adreno_symlink32",
soc_specific: true,
installed_location: "lib/libGLESv2_adreno.so",
symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so",
}

install_symlink {
name: "libq3dtools_adreno_libq3dtools_adreno_symlink32",
soc_specific: true,
installed_location: "lib/libq3dtools_adreno.so",
symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so",
}

install_symlink {
name: "libEGL_adreno_libEGL_adreno_symlink64",
soc_specific: true,
installed_location: "lib64/libEGL_adreno.so",
symlink_target: "/vendor/lib64/egl/libEGL_adreno.so",
}

install_symlink {
name: "libGLESv2_adreno_libGLESv2_adreno_symlink64",
soc_specific: true,
installed_location: "lib64/libGLESv2_adreno.so",
symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so",
}

install_symlink {
name: "libq3dtools_adreno_libq3dtools_adreno_symlink64",
soc_specific: true,
installed_location: "lib64/libq3dtools_adreno.so",
symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
}

Empty file modified proprietary/bin/mssconfig
100755 → 100644
Empty file.
Empty file modified proprietary/bin/sony-modem-switcher
100755 → 100644
Empty file.
Empty file modified proprietary/bin/taimport
100755 → 100644
Empty file.
Binary file modified proprietary/framework/com.fingerprints.extension.jar
Binary file not shown.
Binary file modified proprietary/framework/com.qti.snapdragon.sdk.display.jar
Binary file not shown.
Binary file modified proprietary/framework/com.sonymobile.miscta_impl.jar
Binary file not shown.
Binary file modified proprietary/vendor/app/CACertService/CACertService.apk
Binary file not shown.
Binary file modified proprietary/vendor/app/CneApp/CneApp.apk
Binary file not shown.
Binary file modified proprietary/vendor/app/IWlanService/IWlanService.apk
Binary file not shown.
Binary file removed proprietary/vendor/bin/ATFWD-daemon
Binary file not shown.
Empty file modified proprietary/vendor/bin/adsprpcd
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/ffu
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/hdcp1prov
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/hdcp2p2prov
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/hvdcp_opti
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/mm-pp-dpps
100755 → 100644
Empty file.
Empty file modified proprietary/vendor/bin/msm_irqbalance
100755 → 100644
Empty file.
67 changes: 0 additions & 67 deletions proprietary/vendor/etc/seccomp_policy/[email protected]

This file was deleted.

Binary file removed proprietary/vendor/lib/libI420colorconvert.so
Binary file not shown.
Binary file removed proprietary/vendor/lib/libmm-color-convertor.so
Binary file not shown.
Binary file removed proprietary/vendor/lib64/libI420colorconvert.so
Binary file not shown.
Binary file removed proprietary/vendor/lib64/libmm-color-convertor.so
Binary file not shown.
Binary file removed proprietary/vendor/lib64/[email protected]
Binary file not shown.
19 changes: 12 additions & 7 deletions yoshino-common-vendor.mk
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,12 @@ PRODUCT_PACKAGES += \
vendor.qti.ims.rcsconfig-V2.1-java \
vendor.qti.latency-V2.0-java \
vendor.qti.latency-V2.1-java

PRODUCT_PACKAGES += \
libimscamera_jni_libimscamera_jni_symlink64 \
libimsmedia_jni_libimsmedia_jni_symlink64
PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/bin/ffu:$(TARGET_COPY_OUT_VENDOR)/bin/ffu \
vendor/sony/yoshino-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
vendor/sony/yoshino-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
vendor/sony/yoshino-common/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
vendor/sony/yoshino-common/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \
Expand Down Expand Up @@ -552,7 +555,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/etc/permissions/android.hardware.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.light.xml \
vendor/sony/yoshino-common/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
vendor/sony/yoshino-common/proprietary/vendor/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
vendor/sony/yoshino-common/proprietary/vendor/etc/seccomp_policy/[email protected]:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
vendor/sony/yoshino-common/proprietary/vendor/etc/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
vendor/sony/yoshino-common/proprietary/vendor/etc/seccomp_policy/mediaextractor.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy \
Expand Down Expand Up @@ -627,7 +629,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/lib/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCB.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libFidoCrypto_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFidoCrypto_vendor.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libI420colorconvert.so:$(TARGET_COPY_OUT_VENDOR)/lib/libI420colorconvert.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
Expand Down Expand Up @@ -659,7 +660,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/lib/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-glnext.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-qcom.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib/libminksocket.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libmm-color-convertor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-color-convertor.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-hdcpmgr.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libmmcamera_tintless_algo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmcamera_tintless_algo.so \
vendor/sony/yoshino-common/proprietary/vendor/lib/libmulawdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmulawdec.so \
Expand Down Expand Up @@ -773,7 +773,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libGPTEE_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPTEE_vendor.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libI420colorconvert.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libI420colorconvert.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDecSw.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDecSw.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxEvrcDec.so \
Expand Down Expand Up @@ -840,7 +839,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/lib64/liblqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblqe.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmdetect.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libmm-color-convertor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-color-convertor.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-hdcpmgr.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
vendor/sony/yoshino-common/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
Expand Down Expand Up @@ -936,7 +934,6 @@ PRODUCT_COPY_FILES += \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/sony/yoshino-common/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
Expand Down Expand Up @@ -993,3 +990,11 @@ PRODUCT_PACKAGES += \
CACertService \
CneApp \
IWlanService

PRODUCT_PACKAGES += \
libEGL_adreno_libEGL_adreno_symlink32 \
libGLESv2_adreno_libGLESv2_adreno_symlink32 \
libq3dtools_adreno_libq3dtools_adreno_symlink32 \
libEGL_adreno_libEGL_adreno_symlink64 \
libGLESv2_adreno_libGLESv2_adreno_symlink64 \
libq3dtools_adreno_libq3dtools_adreno_symlink64