diff --git a/Android.bp b/Android.bp index 292db75..231beaf 100644 --- a/Android.bp +++ b/Android.bp @@ -70,100 +70,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libbitmlengine", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libbitmlengine.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libofflinelog", - "libsync", - "libcdsprpc", - "libz", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libbitmlengine.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libofflinelog", - "libsync", - "libcdsprpc", - "libz", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libbitmlenginev2", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libbitmlenginev2.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libofflinelog", - "libsync", - "libcdsprpc", - "libz", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libbitmlenginev2.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libofflinelog", - "libsync", - "libcdsprpc", - "libz", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcamxexternalformatutils", owner: "motorola", @@ -4573,6 +4479,66 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libbitmlengine", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libbitmlengine.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libofflinelog", + "libsync", + "libcdsprpc", + "libz", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libbitmlenginev2", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libbitmlenginev2.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libofflinelog", + "libsync", + "libcdsprpc", + "libz", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libc2d_helper", owner: "motorola", @@ -5924,34 +5890,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmotohid", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libmotohid.so", - ], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "motorola.hardware.health.storage@1.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmpbase", owner: "motorola", diff --git a/fogos-vendor.mk b/fogos-vendor.mk index b88e9a9..2b48d30 100644 --- a/fogos-vendor.mk +++ b/fogos-vendor.mk @@ -219,8 +219,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ libacdbloader \ - libbitmlengine \ - libbitmlenginev2 \ libcamxexternalformatutils \ com.mot.eeprom.mot_gt24p256c_s5kjns_eeprom \ com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom \ @@ -328,6 +326,8 @@ PRODUCT_PACKAGES += \ libarcsoft_portrait_super_night_se_raw \ libarcsoft_super_night_raw \ libarcsoft_super_night_se_raw \ + libbitmlengine \ + libbitmlenginev2 \ libc2d_helper \ libcamera_nn_stub \ libcamerapostproc \ @@ -364,7 +364,6 @@ PRODUCT_PACKAGES += \ libmot_afd \ libmot_chi_desktop_helper \ libmot_engine_settings \ - libmotohid \ libmpbase \ libofflinedump \ libofflinelog \ diff --git a/proprietary/vendor/lib/libbitmlengine.so b/proprietary/vendor/lib/libbitmlengine.so deleted file mode 100644 index 3b3f408..0000000 Binary files a/proprietary/vendor/lib/libbitmlengine.so and /dev/null differ diff --git a/proprietary/vendor/lib/libbitmlenginev2.so b/proprietary/vendor/lib/libbitmlenginev2.so deleted file mode 100644 index 3993f64..0000000 Binary files a/proprietary/vendor/lib/libbitmlenginev2.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libmotohid.so b/proprietary/vendor/lib64/libmotohid.so deleted file mode 100644 index 9bad969..0000000 Binary files a/proprietary/vendor/lib64/libmotohid.so and /dev/null differ