diff --git a/Android.bp b/Android.bp index c76102b..d2ee1df 100644 --- a/Android.bp +++ b/Android.bp @@ -15,121 +15,6 @@ soong_namespace { ], } -cc_prebuilt_library_shared { - name: "libcamera_algoup_jni.xiaomi", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so", - ], - shared_libs: [ - "libgui_shim_miuicamera", - "libbinder", - "libcamera_client", - "libcamera_metadata", - "libcutils", - "libgui", - "liblog", - "libutils", - "libvndksupport", - "libandroid", - "libandroid_runtime", - "libbase", - "libmedia_jni_utils", - "libnativehelper", - "libnativewindow", - "libui", - "android.hidl.token@1.0-utils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, -} - -cc_prebuilt_library_shared { - name: "libcamera_mianode_jni.xiaomi", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so", - ], - shared_libs: [ - "libgui_shim_miuicamera", - "libbinder", - "libcamera_client", - "libcamera_metadata", - "libcutils", - "libgui", - "liblog", - "libutils", - "libvndksupport", - "libxml2", - "libandroid", - "libmedia_jni_utils", - "libui", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, -} - -cc_prebuilt_library_shared { - name: "libmicampostproc_client", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system/lib64/libmicampostproc_client.so", - ], - shared_libs: [ - "liblog", - "libutils", - "libcutils", - "libhardware", - "libnativewindow", - "libEGL", - "libGLESv2", - "libfmq", - "libgui", - "libui", - "libcamera_client", - "libcamera_metadata", - "libmedia_jni_utils", - "libnativehelper", - "libhidlbase", - "vendor.xiaomi.hardware.campostproc@1.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.diaghal-V1-ndk", owner: "xiaomi", @@ -155,34 +40,6 @@ cc_prebuilt_library_shared { prefer: true, } -cc_prebuilt_library_shared { - name: "vendor.xiaomi.hardware.campostproc@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so", - ], - shared_libs: [ - "android.hardware.camera.common@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, -} - cc_prebuilt_library_shared { name: "android.hardware.bluetooth.audio-impl_prebuilt", owner: "xiaomi", @@ -40536,22 +40393,6 @@ prebuilt_apex { soc_specific: true, } -android_app_import { - name: "MiuiCamera", - owner: "xiaomi", - apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk", - overrides: [ - "Camera", - "Camera2", - "GoogleCameraGo", - ], - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, -} - android_app_import { name: "CACertService", owner: "xiaomi", diff --git a/onyx-vendor.mk b/onyx-vendor.mk index 5022edf..f2b4ae9 100644 --- a/onyx-vendor.mk +++ b/onyx-vendor.mk @@ -1948,11 +1948,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/onyx/proprietary/vendor/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/libnfc-nxp_RF.conf PRODUCT_PACKAGES += \ - libcamera_algoup_jni.xiaomi \ - libcamera_mianode_jni.xiaomi \ - libmicampostproc_client \ vendor.qti.diaghal-V1-ndk \ - vendor.xiaomi.hardware.campostproc@1.0 \ android.hardware.bluetooth.audio-impl_prebuilt \ btaudio_offload_if \ com.mi.node.fd \ @@ -3251,7 +3247,6 @@ PRODUCT_PACKAGES += \ odm_lib_rfsa_adsp_libmialgo_mc_bokeh_cdsp_skel_so \ odm_lib_rfsa_adsp_libmialgo_tracker_cdsp_skel_so \ com.google.android.widevine.nonupdatable \ - MiuiCamera \ CACertService \ CneApp \ IWlanService \ diff --git a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so b/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so deleted file mode 100644 index 7feebd0..0000000 Binary files a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so and /dev/null differ diff --git a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so deleted file mode 100644 index c9bbd83..0000000 Binary files a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so and /dev/null differ diff --git a/proprietary/system/lib64/libmicampostproc_client.so b/proprietary/system/lib64/libmicampostproc_client.so deleted file mode 100644 index 00ce206..0000000 Binary files a/proprietary/system/lib64/libmicampostproc_client.so and /dev/null differ diff --git a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so b/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so deleted file mode 100644 index 9252490..0000000 Binary files a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so and /dev/null differ diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk deleted file mode 100644 index 7df7cb3..0000000 Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk and /dev/null differ