diff --git a/Android.bp b/Android.bp index 219d2af..9973d3a 100644 --- a/Android.bp +++ b/Android.bp @@ -746,30 +746,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libems_service", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libems_service.so", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - "liblog", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libengmode_client", owner: "samsung", @@ -798,54 +774,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libepic_helper", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libepic_helper.so", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - "liblog", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libexynos_migov", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libexynos_migov.so", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - "liblog", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libexynoscamera_cnr_plugin", owner: "samsung", @@ -953,30 +881,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libgmc", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libgmc.so", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - "liblog", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libhwjsqz", owner: "samsung", @@ -1238,7 +1142,7 @@ cc_prebuilt_library_shared { "libjsoncpp", "libVendorSemTelephonyProps", "libVendorSemDataProps", - "libprotobuf-cpp-full-21.7", + "libprotobuf-cpp-full", "libvkmanager_vendor", "libengmode_client", "libbase", @@ -2389,30 +2293,6 @@ prebuilt_etc_xml { soc_specific: true, } -cc_prebuilt_binary { - name: "epic", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/epic", - ], - shared_libs: [ - "libc", - "libm", - "libdl", - "liblog", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - cc_prebuilt_binary { name: "android.hardware.drm-service.widevine", owner: "samsung", diff --git a/proprietary/vendor/bin/epic b/proprietary/vendor/bin/epic deleted file mode 100755 index 764613e..0000000 Binary files a/proprietary/vendor/bin/epic and /dev/null differ diff --git a/proprietary/vendor/etc/ems.json b/proprietary/vendor/etc/ems.json deleted file mode 100644 index ce8d88d..0000000 --- a/proprietary/vendor/etc/ems.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "requesters" : [ - { - "name" : "change@/devices/platform/ems", - "requests" : [ - { - "name" : "SYSBUSY", - "handle" : "sysbusy", - "paths" : [ - "/sys/class/devfreq/17000010.devfreq_mif/interactive/current_mode" - ] - }, - { - "name" : "NOTI_MODE", - "handle" : "mode", - "paths" :[ - "/sys/kernel/ems/emstune/req_mode" - ] - } - ] - } - ] -} diff --git a/proprietary/vendor/etc/ems_parameter.json b/proprietary/vendor/etc/ems_parameter.json deleted file mode 100644 index d552a8a..0000000 --- a/proprietary/vendor/etc/ems_parameter.json +++ /dev/null @@ -1,406 +0,0 @@ -{ - "camera_mode" : [ - { - "main" : 5, - "sub" : 0, - "param" : [ - "0,5,0,1 0", - "0,5,0,3 0", - "0,5,0,8 0", - "1,5,0,0,0 100", - "1,5,0,6,0 100", - "1,5,0,0,1 100", - "1,5,0,6,1 100", - "1,5,0,0,2 100", - "1,5,0,6,2 100", - "1,5,0,0,3 100", - "1,5,0,6,3 100", - "1,5,0,0,4 100", - "1,5,0,6,4 100", - "1,5,0,0,5 100", - "1,5,0,6,5 100", - "1,5,0,0,6 100", - "1,5,0,6,6 100", - "1,5,0,0,7 100", - "1,5,0,6,7 100", - "1,5,0,0,8 100", - "1,5,0,6,8 100", - "2,5,0,0,0 100", - "2,5,0,6,0 100", - "2,5,0,0,1 100", - "2,5,0,6,1 100", - "2,5,0,0,2 100", - "2,5,0,6,2 100", - "2,5,0,0,3 100", - "2,5,0,6,3 100", - "2,5,0,0,4 100", - "2,5,0,6,4 100", - "2,5,0,0,5 100", - "2,5,0,6,5 100", - "2,5,0,0,6 100", - "2,5,0,6,6 100", - "2,5,0,0,7 100", - "2,5,0,6,7 100", - "2,5,0,0,8 100", - "2,5,0,6,8 100", - "3,5,0,0,0 0", - "3,5,0,6,0 0", - "3,5,0,0,1 0", - "3,5,0,6,1 0", - "3,5,0,0,2 0", - "3,5,0,6,2 0", - "3,5,0,0,3 0", - "3,5,0,6,3 0", - "3,5,0,0,4 0", - "3,5,0,6,4 0", - "3,5,0,0,5 0", - "3,5,0,6,5 0", - "3,5,0,0,6 0", - "3,5,0,6,6 0", - "3,5,0,0,7 0", - "3,5,0,6,7 0", - "3,5,0,0,8 0", - "3,5,0,6,8 0", - "6,5,0,0 25", - "6,5,0,6 25", - "21,5,0,3 0xFF", - "25,5,0 20" - ] - }, - { - "main" : 5, - "sub" : 1, - "param" : [ - "0,5,0,1 4", - "0,5,0,3 4", - "0,5,0,8 4", - "1,5,0,0,0 100", - "1,5,0,6,0 100", - "1,5,0,0,1 100", - "1,5,0,6,1 100", - "1,5,0,0,2 100", - "1,5,0,6,2 100", - "1,5,0,0,3 100", - "1,5,0,6,3 100", - "1,5,0,0,4 100", - "1,5,0,6,4 100", - "1,5,0,0,5 100", - "1,5,0,6,5 100", - "1,5,0,0,6 100", - "1,5,0,6,6 100", - "1,5,0,0,7 100", - "1,5,0,6,7 100", - "1,5,0,0,8 100", - "1,5,0,6,8 100", - "2,5,0,0,0 200", - "2,5,0,6,0 200", - "2,5,0,0,1 200", - "2,5,0,6,1 200", - "2,5,0,0,2 200", - "2,5,0,6,2 200", - "2,5,0,0,3 200", - "2,5,0,6,3 200", - "2,5,0,0,4 200", - "2,5,0,6,4 200", - "2,5,0,0,5 200", - "2,5,0,6,5 200", - "2,5,0,0,6 200", - "2,5,0,6,6 200", - "2,5,0,0,7 200", - "2,5,0,6,7 200", - "2,5,0,0,8 200", - "2,5,0,6,8 200", - "3,5,0,0,0 0", - "3,5,0,6,0 0", - "3,5,0,0,1 0", - "3,5,0,6,1 0", - "3,5,0,0,2 0", - "3,5,0,6,2 0", - "3,5,0,0,3 0", - "3,5,0,6,3 0", - "3,5,0,0,4 0", - "3,5,0,6,4 0", - "3,5,0,0,5 0", - "3,5,0,6,5 0", - "3,5,0,0,6 0", - "3,5,0,6,6 0", - "3,5,0,0,7 0", - "3,5,0,6,7 0", - "3,5,0,0,8 0", - "3,5,0,6,8 0", - "6,5,0,0 5", - "6,5,0,6 25", - "21,5,0,3 0xFF", - "25,5,0 10" - ] - }, - { - "main" : 5, - "sub" : 2, - "param" : [ - "0,5,0,1 4", - "0,5,0,3 4", - "0,5,0,8 4", - "1,5,0,0,0 100", - "1,5,0,6,0 100", - "1,5,0,0,1 100", - "1,5,0,6,1 100", - "1,5,0,0,2 100", - "1,5,0,6,2 100", - "1,5,0,0,3 100", - "1,5,0,6,3 100", - "1,5,0,0,4 100", - "1,5,0,6,4 100", - "1,5,0,0,5 100", - "1,5,0,6,5 100", - "1,5,0,0,6 100", - "1,5,0,6,6 100", - "1,5,0,0,7 100", - "1,5,0,6,7 100", - "1,5,0,0,8 100", - "1,5,0,6,8 100", - "2,5,0,0,0 100", - "2,5,0,6,0 100", - "2,5,0,0,1 100", - "2,5,0,6,1 100", - "2,5,0,0,2 100", - "2,5,0,6,2 100", - "2,5,0,0,3 100", - "2,5,0,6,3 100", - "2,5,0,0,4 100", - "2,5,0,6,4 100", - "2,5,0,0,5 100", - "2,5,0,6,5 100", - "2,5,0,0,6 100", - "2,5,0,6,6 100", - "2,5,0,0,7 100", - "2,5,0,6,7 100", - "2,5,0,0,8 100", - "2,5,0,6,8 100", - "3,5,0,0,0 0", - "3,5,0,6,0 0", - "3,5,0,0,1 0", - "3,5,0,6,1 0", - "3,5,0,0,2 0", - "3,5,0,6,2 0", - "3,5,0,0,3 0", - "3,5,0,6,3 0", - "3,5,0,0,4 0", - "3,5,0,6,4 0", - "3,5,0,0,5 0", - "3,5,0,6,5 0", - "3,5,0,0,6 0", - "3,5,0,6,6 0", - "3,5,0,0,7 0", - "3,5,0,6,7 0", - "3,5,0,0,8 0", - "3,5,0,6,8 0", - "6,5,0,0 5", - "6,5,0,6 25", - "21,5,0,3 0xFF", - "25,5,0 10" - ] - }, - { - "main" : 5, - "sub" : 3, - "param" : [ - "0,5,0,1 5", - "0,5,0,3 5", - "0,5,0,8 5", - "1,5,0,0,0 400", - "1,5,0,6,0 400", - "1,5,0,0,1 400", - "1,5,0,6,1 400", - "1,5,0,0,2 400", - "1,5,0,6,2 400", - "1,5,0,0,3 400", - "1,5,0,6,3 400", - "1,5,0,0,4 400", - "1,5,0,6,4 400", - "1,5,0,0,5 400", - "1,5,0,6,5 400", - "1,5,0,0,6 400", - "1,5,0,6,6 400", - "1,5,0,0,7 400", - "1,5,0,6,7 400", - "1,5,0,0,8 400", - "1,5,0,6,8 400", - "2,5,0,0,0 800", - "2,5,0,6,0 800", - "2,5,0,0,1 800", - "2,5,0,6,1 800", - "2,5,0,0,2 800", - "2,5,0,6,2 800", - "2,5,0,0,3 800", - "2,5,0,6,3 800", - "2,5,0,0,4 800", - "2,5,0,6,4 800", - "2,5,0,0,5 800", - "2,5,0,6,5 800", - "2,5,0,0,6 800", - "2,5,0,6,6 800", - "2,5,0,0,7 800", - "2,5,0,6,7 800", - "2,5,0,0,8 800", - "2,5,0,6,8 800", - "3,5,0,0,0 5", - "3,5,0,6,0 5", - "3,5,0,0,1 5", - "3,5,0,6,1 5", - "3,5,0,0,2 5", - "3,5,0,6,2 5", - "3,5,0,0,3 5", - "3,5,0,6,3 5", - "3,5,0,0,4 5", - "3,5,0,6,4 5", - "3,5,0,0,5 5", - "3,5,0,6,5 5", - "3,5,0,0,6 5", - "3,5,0,6,6 5", - "3,5,0,0,7 5", - "3,5,0,6,7 5", - "3,5,0,0,8 5", - "3,5,0,6,8 5", - "6,5,0,0 5", - "6,5,0,6 25", - "21,5,0,3 0xFF", - "25,5,0 10" - ] - }, - { - "main" : 5, - "sub" : 4, - "param" : [ - "0,5,0,1 5", - "0,5,0,3 5", - "0,5,0,8 5", - "1,5,0,0,0 400", - "1,5,0,6,0 400", - "1,5,0,0,1 400", - "1,5,0,6,1 400", - "1,5,0,0,2 400", - "1,5,0,6,2 400", - "1,5,0,0,3 400", - "1,5,0,6,3 400", - "1,5,0,0,4 400", - "1,5,0,6,4 400", - "1,5,0,0,5 400", - "1,5,0,6,5 400", - "1,5,0,0,6 400", - "1,5,0,6,6 400", - "1,5,0,0,7 400", - "1,5,0,6,7 400", - "1,5,0,0,8 400", - "1,5,0,6,8 400", - "2,5,0,0,0 800", - "2,5,0,6,0 800", - "2,5,0,0,1 800", - "2,5,0,6,1 800", - "2,5,0,0,2 800", - "2,5,0,6,2 800", - "2,5,0,0,3 800", - "2,5,0,6,3 800", - "2,5,0,0,4 800", - "2,5,0,6,4 800", - "2,5,0,0,5 800", - "2,5,0,6,5 800", - "2,5,0,0,6 800", - "2,5,0,6,6 800", - "2,5,0,0,7 800", - "2,5,0,6,7 800", - "2,5,0,0,8 800", - "2,5,0,6,8 800", - "3,5,0,0,0 5", - "3,5,0,6,0 5", - "3,5,0,0,1 5", - "3,5,0,6,1 5", - "3,5,0,0,2 5", - "3,5,0,6,2 5", - "3,5,0,0,3 5", - "3,5,0,6,3 5", - "3,5,0,0,4 5", - "3,5,0,6,4 5", - "3,5,0,0,5 5", - "3,5,0,6,5 5", - "3,5,0,0,6 5", - "3,5,0,6,6 5", - "3,5,0,0,7 5", - "3,5,0,6,7 5", - "3,5,0,0,8 5", - "3,5,0,6,8 5", - "6,5,0,0 5", - "6,5,0,6 25", - "21,5,0,3 0xC0", - "25,5,0 10" - ] - }, - { - "main" : 5, - "sub" : 5, - "param" : [ - "0,5,2,1 5", - "0,5,2,3 5", - "0,5,2,8 5", - "1,5,2,0,0 400", - "1,5,2,6,0 400", - "1,5,2,0,1 400", - "1,5,2,6,1 400", - "1,5,2,0,2 400", - "1,5,2,6,2 400", - "1,5,2,0,3 400", - "1,5,2,6,3 400", - "1,5,2,0,4 400", - "1,5,2,6,4 400", - "1,5,2,0,5 400", - "1,5,2,6,5 400", - "1,5,2,0,6 400", - "1,5,2,6,6 400", - "1,5,2,0,7 400", - "1,5,2,6,7 400", - "1,5,2,0,8 400", - "1,5,2,6,8 400", - "2,5,2,0,0 800", - "2,5,2,6,0 800", - "2,5,2,0,1 800", - "2,5,2,6,1 800", - "2,5,2,0,2 800", - "2,5,2,6,2 800", - "2,5,2,0,3 800", - "2,5,2,6,3 800", - "2,5,2,0,4 800", - "2,5,2,6,4 800", - "2,5,2,0,5 800", - "2,5,2,6,5 800", - "2,5,2,0,6 800", - "2,5,2,6,6 800", - "2,5,2,0,7 800", - "2,5,2,6,7 800", - "2,5,2,0,8 800", - "2,5,2,6,8 800", - "3,5,2,0,0 5", - "3,5,2,6,0 5", - "3,5,2,0,1 5", - "3,5,2,6,1 5", - "3,5,2,0,2 5", - "3,5,2,6,2 5", - "3,5,2,0,3 5", - "3,5,2,6,3 5", - "3,5,2,0,4 5", - "3,5,2,6,4 5", - "3,5,2,0,5 5", - "3,5,2,6,5 5", - "3,5,2,0,6 5", - "3,5,2,6,6 5", - "3,5,2,0,7 5", - "3,5,2,6,7 5", - "3,5,2,0,8 5", - "3,5,2,6,8 5", - "6,5,2,0 5", - "6,5,2,6 25", - "21,5,2,3 0xC0", - "25,5,2 10" - ] - } - ] -} diff --git a/proprietary/vendor/etc/epic.json b/proprietary/vendor/etc/epic.json deleted file mode 100644 index 0ad1862..0000000 Binary files a/proprietary/vendor/etc/epic.json and /dev/null differ diff --git a/proprietary/vendor/lib64/libems_service.so b/proprietary/vendor/lib64/libems_service.so deleted file mode 100644 index b3d16fc..0000000 Binary files a/proprietary/vendor/lib64/libems_service.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libepic_helper.so b/proprietary/vendor/lib64/libepic_helper.so deleted file mode 100644 index 39187b5..0000000 Binary files a/proprietary/vendor/lib64/libepic_helper.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libexynos_migov.so b/proprietary/vendor/lib64/libexynos_migov.so deleted file mode 100644 index a3fcfa1..0000000 Binary files a/proprietary/vendor/lib64/libexynos_migov.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libgmc.so b/proprietary/vendor/lib64/libgmc.so deleted file mode 100644 index 2040dcd..0000000 Binary files a/proprietary/vendor/lib64/libgmc.so and /dev/null differ diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk index 3b6aa88..19620b2 100644 --- a/s5e8825-common-vendor.mk +++ b/s5e8825-common-vendor.mk @@ -8,9 +8,6 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_COPY_FILES += \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/ems.json:$(TARGET_COPY_OUT_VENDOR)/etc/ems.json \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/ems_parameter.json:$(TARGET_COPY_OUT_VENDOR)/etc/ems_parameter.json \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/epic.json:$(TARGET_COPY_OUT_VENDOR)/etc/epic.json \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/ca.pem:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/ca.pem \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm-service.widevine.rc \ @@ -76,15 +73,11 @@ PRODUCT_PACKAGES += \ libcrypto-tm \ libdatamod \ libegis_fp_normal_sensor_test \ - libems_service \ libengmode_client \ - libepic_helper \ - libexynos_migov \ libexynoscamera_cnr_plugin \ libexynoscamera_plugin \ libfloatingfeature \ libgf_in_system_lib \ - libgmc \ libhwjsqz \ liblastaboxmsg \ liboemcrypto \ @@ -137,7 +130,6 @@ PRODUCT_PACKAGES += \ vendor.samsung.hardware.radio.exclude.slsi.xml \ vendor.samsung.hardware.radio_manifest_2_34.xml \ vendor.samsung.hardware.sehradio_manifest_2_34.xml \ - epic \ android.hardware.drm-service.widevine \ android.hardware.security.keymint-service.samsung \ gps \