diff --git a/extract-files.sh b/extract-files.sh index decc890..23e6807 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -22,9 +22,6 @@ source "${HELPER}" function blob_fixup { case "$1" in - vendor/lib/libstagefright_omx_utils.so) - "$PATCHELF" --add-needed "libshim_stagefright_foundation.so" "$2" - ;; vendor/lib*/libhifills.so) "$PATCHELF" --add-needed "libunwindstack.so" "$2" ;; diff --git a/libshims/Android.bp b/libshims/Android.bp index b9822e0..aad3b3c 100644 --- a/libshims/Android.bp +++ b/libshims/Android.bp @@ -1,10 +1,3 @@ -cc_library_shared { - name: "libshim_stagefright_foundation", - srcs: ["MediaDefs.cpp"], - shared_libs: ["libstagefright_foundation"], - vendor: true, -} - cc_library_shared { name: "libcamera_metadata_helper", proprietary: true, diff --git a/libshims/MediaDefs.cpp b/libshims/MediaDefs.cpp deleted file mode 100644 index 8e09132..0000000 --- a/libshims/MediaDefs.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace android { - const char *MEDIA_MIMETYPE_AUDIO_IMA = "audio/x-ima"; - const char *MEDIA_MIMETYPE_AUDIO_EVRC = "audio/evrc"; - const char *MEDIA_MIMETYPE_AUDIO_APE = "audio/x-ape"; - const char *MEDIA_MIMETYPE_VIDEO_MP43 = "video/mp43"; - const char *MEDIA_MIMETYPE_VIDEO_WMV1 = "video/x-ms-wmv7"; - const char *MEDIA_MIMETYPE_VIDEO_WMV2 = "video/x-ms-wmv8"; - const char *MEDIA_MIMETYPE_VIDEO_WMV3 = "video/x-ms-wmv"; - const char *MEDIA_MIMETYPE_VIDEO_WVC1 = "video/wvc1"; -} // namespece android diff --git a/proprietary-files.txt b/proprietary-files.txt index caae7f8..43c3d1a 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -36,32 +36,14 @@ vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service vendor/bin/hw/wpa_supplicant vendor/bin/main_abox vendor/bin/mcDriverDaemon -vendor/bin/moredump -vendor/bin/moredump.bin vendor/bin/secril_config_svc -vendor/bin/slsi_wlan_udi_log -vendor/bin/slsi_wlan_udi_log_decode -vendor/bin/test_model.json vendor/bin/wlbtd -vendor/bin/wvkprov -vendor/etc/SoundBoosterParam.txt vendor/etc/a2dp_audio_policy_configuration.xml vendor/etc/audio_board_info.xml vendor/etc/audio_policy_volumes.xml vendor/etc/audio_policy_volumes_sec.xml vendor/etc/bluetooth/bt_did.conf -vendor/etc/carrier/ACG/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/BST/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/CCT/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/LRA/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/SPR/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/TFN/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/USC/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/VMU/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/VZW/permissions/android.hardware.telephony.cdma.xml -vendor/etc/carrier/XAS/permissions/android.hardware.telephony.cdma.xml vendor/etc/default_volume_tables.xml -vendor/etc/dolby/dax-default.xml vendor/etc/floating_feature.xml vendor/etc/fstab.exynos7904 vendor/etc/gnss/ca.pem @@ -84,24 +66,14 @@ vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc vendor/etc/init/wifi.rc vendor/etc/init/wifi_slsi.rc vendor/etc/media_codecs.xml -vendor/etc/media_codecs_ac4.xml -vendor/etc/media_codecs_ddp.xml -vendor/etc/media_codecs_dolby_audio.xml vendor/etc/media_codecs_google_audio.xml vendor/etc/media_codecs_google_telephony.xml vendor/etc/media_codecs_google_video.xml vendor/etc/media_codecs_google_video_le.xml vendor/etc/media_codecs_performance.xml -vendor/etc/media_codecs_sec_ape.xml -vendor/etc/media_codecs_sec_primary.xml -vendor/etc/media_codecs_sec_qcp.xml -vendor/etc/media_codecs_sec_secondary.xml -vendor/etc/media_codecs_sec_video_primary.xml vendor/etc/media_profiles_V1_0.xml vendor/etc/mixer_gains.xml vendor/etc/mixer_paths.xml -vendor/etc/mtu-conf.xml -vendor/etc/pdpcnt-conf.xml vendor/etc/permissions/android.hardware.bluetooth.xml vendor/etc/permissions/android.hardware.bluetooth_le.xml vendor/etc/permissions/android.hardware.camera.flash-autofocus.xml @@ -134,20 +106,6 @@ vendor/etc/plmn_delta_usacdma.bin vendor/etc/plmn_delta_usagsm.bin vendor/etc/plmn_se13.bin vendor/etc/r_submix_audio_policy_configuration.xml -vendor/etc/saiv/fd/fast_face_detect_model_full_angle_16_CHAR.dat -vendor/etc/saiv/gae/MeanFea.bin -vendor/etc/saiv/gae/ParaFea.bin -vendor/etc/saiv/gae/PmAgeFeatSelIdx.bin -vendor/etc/saiv/gae/PmAgeModel.bin -vendor/etc/saiv/gae/PmExpFeatSelIdx.bin -vendor/etc/saiv/gae/PmExpModel.bin -vendor/etc/saiv/gae/PmGenModel.bin -vendor/etc/saiv/gae/PmGenderFeatSelIdx.bin -vendor/etc/saiv/ld/avg_hog_13pt.dat -vendor/etc/saiv/ld/avg_hog_35pt.dat -vendor/etc/saiv/ld/mean_35pt.txt -vendor/etc/saiv/ld/regress_matrix_short_13pt.dat -vendor/etc/saiv/ld/regress_matrix_short_35pt.dat vendor/etc/seccomp_policy/configstore@1.1.policy vendor/etc/seccomp_policy/mediacodec.policy vendor/etc/seccomp_policy/mediaextractor.policy @@ -165,58 +123,13 @@ vendor/etc/selinux/vendor_property_contexts vendor/etc/selinux/vendor_seapp_contexts vendor/etc/selinux/vendor_sepolicy.cil vendor/etc/selinux/vndservice_contexts -vendor/etc/snap_gpu_kernel_32.bin -vendor/etc/snap_gpu_kernel_64.bin -vendor/etc/somxreg.conf -vendor/etc/str/str_preference_data.dat -vendor/etc/tms_audio_policy_configuration.xml vendor/etc/usb_audio_policy_configuration.xml vendor/etc/wifi/hydra_config.sdb vendor/etc/wifi/indoorchannel.info vendor/etc/wifi/mx vendor/etc/wifi/mx140.bin -vendor/etc/wifi/mx140/debug/common/log-strings.bin -vendor/etc/wifi/mx140/debug/hardware/moredump/bt_registers.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/cortexM4.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/cortexR4.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox16.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox4.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox8.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.bin -vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/pl192vic.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/rf_chip_registers.xml -vendor/etc/wifi/mx140/debug/hardware/moredump/wlan_sys_registers.xml -vendor/etc/wifi/mx140/debug/wlan/hip_signals.xml -vendor/etc/wifi/mx140/debug/wlan/id.txt -vendor/etc/wifi/mx140/debug/wlan/mib_out.xml -vendor/etc/wifi/mx140/debug/wlan/symbols.dbg -vendor/etc/wifi/mx140/debug/wlan/unicli.dbg -vendor/etc/wifi/mx140/debug/wlan/unitab.dbg -vendor/etc/wifi/mx140/debug/wlan/univif.dbg -vendor/etc/wifi/mx140/debug/wlan/xide_mib.dbg vendor/etc/wifi/mx140_bt.hcf vendor/etc/wifi/mx140_t.bin -vendor/etc/wifi/mx140_t/debug/common/log-strings.bin -vendor/etc/wifi/mx140_t/debug/hardware/moredump/bt_registers.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexM4.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexR4.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox16.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox4.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox8.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.bin -vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/pl192vic.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/rf_chip_registers.xml -vendor/etc/wifi/mx140_t/debug/hardware/moredump/wlan_sys_registers.xml -vendor/etc/wifi/mx140_t/debug/wlan/hip_signals.xml -vendor/etc/wifi/mx140_t/debug/wlan/id.txt -vendor/etc/wifi/mx140_t/debug/wlan/mib_out.xml -vendor/etc/wifi/mx140_t/debug/wlan/symbols.dbg -vendor/etc/wifi/mx140_t/debug/wlan/unicli.dbg -vendor/etc/wifi/mx140_t/debug/wlan/unitab.dbg -vendor/etc/wifi/mx140_t/debug/wlan/univif.dbg -vendor/etc/wifi/mx140_t/debug/wlan/xide_mib.dbg vendor/etc/wifi/mx140_t_wlan.hcf vendor/etc/wifi/mx140_t_wlan_t.hcf vendor/etc/wifi/mx140_wlan.hcf @@ -225,8 +138,6 @@ vendor/etc/wifi/p2p_supplicant_overlay.conf vendor/etc/wifi/platform.txt vendor/etc/wifi/wpa_supplicant.conf vendor/etc/wifi/wpa_supplicant_overlay.conf -vendor/etc/wlan_common_rc -vendor/etc/wlan_vendor_rc vendor/etc/yas_set.cfg vendor/firmware/APBargeIn_AUDIO_SLSI.bin vendor/firmware/AP_AUDIO_SLSI.bin @@ -253,14 +164,11 @@ vendor/lib/hw/gralloc.exynos7904.so vendor/lib/hw/hwcomposer.exynos7904.so vendor/lib/hw/lights.universal7904.so vendor/lib/hw/memtrack.exynos7904.so -vendor/lib/hw/power.universal7904.so vendor/lib/hw/sensors.universal7904.so vendor/lib/hw/thermal.universal7904.so -vendor/lib/libDLInterface.camera.samsung.so vendor/lib/libExynosHWCService.so vendor/lib/libExynosOMX_Core.so vendor/lib/libExynosOMX_Resourcemanager.so -vendor/lib/libFrucSSMLib.so vendor/lib/libGrallocWrapper.so vendor/lib/libMcClient.so vendor/lib/libOpenCv.camera.samsung.so @@ -270,8 +178,6 @@ vendor/lib/lib_SoundAlive_SRC384_ver320.so vendor/lib/lib_soundaliveresampler.so vendor/lib/libacryl.so vendor/lib/libalsautils.so -vendor/lib/libapex_cmn.so -vendor/lib/libapex_utils.so vendor/lib/libaudio-ril.so vendor/lib/libaudio_soundtrigger.so vendor/lib/libaudioroute.so @@ -301,7 +207,6 @@ vendor/lib/libmfhdr_interface.so vendor/lib/libmpbase.so vendor/lib/libnbaio_mono.so vendor/lib/liboemcrypto.so -vendor/lib/libpredeflicker_native.so vendor/lib/libqfp_sensortest.so vendor/lib/librecordalive.so vendor/lib/libreference-ril.so @@ -309,29 +214,17 @@ vendor/lib/libril.so vendor/lib/librilutils.so vendor/lib/libsaiv_BeautySolutionVideo.so vendor/lib/libsamsungDiamondVoice.so -vendor/lib/libsavscmn.so vendor/lib/libsec-ril-dsds.so vendor/lib/libsec-ril.so vendor/lib/libsecaudioinfo.so vendor/lib/libsecnativefeature.so -vendor/lib/libsecure_storage.so vendor/lib/libsensorlistener.so vendor/lib/libsensorndkbridge.so vendor/lib/libskeymaster3device.so -vendor/lib/libsnap_caffe.so -vendor/lib/libsnap_caffe_wrapper.so -vendor/lib/libsnap_compute.so -vendor/lib/libsnap_compute_wrapper.so -vendor/lib/libsnap_vndk.so -vendor/lib/libsomxcore_vendor.so -vendor/lib/libstagefright_bufferqueue_helper_vendor.so -vendor/lib/libstagefright_foundation.so -vendor/lib/libstagefright_omx_utils.so vendor/lib/libstagefright_omx_vendor.so vendor/lib/libstagefright_soft_ac4dec.so vendor/lib/libstagefright_soft_ddpdec.so vendor/lib/libstagefrighthw.so -vendor/lib/libswldc_capture_core.camera.samsung.so vendor/lib/libsynaFpSensorTestNwd.so vendor/lib/libtinyalsa.so vendor/lib/libuniapi.so @@ -342,7 +235,6 @@ vendor/lib/libwifi-hal.so vendor/lib/libwpa_client.so vendor/lib/libwrappergps.so vendor/lib/libwvhidl.so -vendor/lib/libxcv.camera.samsung.so vendor/lib/libyasalgo.so vendor/lib/mediadrm/libwvdrmengine.so vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so @@ -380,11 +272,9 @@ vendor/lib64/hw/hwcomposer.exynos7904.so vendor/lib64/hw/keystore.mdfpp.so vendor/lib64/hw/lights.universal7904.so vendor/lib64/hw/memtrack.exynos7904.so -vendor/lib64/hw/power.universal7904.so vendor/lib64/hw/sensors.universal7904.so vendor/lib64/hw/thermal.universal7904.so vendor/lib64/hw/vendor.samsung.hardware.gnss@2.0-impl.so -vendor/lib64/libDLInterface.camera.samsung.so vendor/lib64/libExynosHWCService.so vendor/lib64/libExynosOMX_Core.so vendor/lib64/libExynosOMX_Resourcemanager.so @@ -396,8 +286,6 @@ vendor/lib64/lib_SoundAlive_SRC384_ver320.so vendor/lib64/lib_soundaliveresampler.so vendor/lib64/libacryl.so vendor/lib64/libalsautils.so -vendor/lib64/libapex_cmn.so -vendor/lib64/libapex_utils.so vendor/lib64/libbauthserver.so vendor/lib64/libbauthtzcommon.so vendor/lib64/libbt-vendor.so @@ -419,7 +307,6 @@ vendor/lib64/libhigh_dynamic_range.so vendor/lib64/libhwc2on1adapter.so vendor/lib64/libhwc2onfbadapter.so vendor/lib64/libhwjpeg.so -vendor/lib64/libhwminijail.so vendor/lib64/libion_exynos.so vendor/lib64/libkeymaster2_mdfpp.so vendor/lib64/libkeymaster_helper_vendor.so @@ -429,40 +316,27 @@ vendor/lib64/libmfhdr_interface.so vendor/lib64/libmpbase.so vendor/lib64/libmpp.so vendor/lib64/libnbaio_mono.so -vendor/lib64/libpredeflicker_native.so vendor/lib64/libqfp_sensortest.so vendor/lib64/libreference-ril.so vendor/lib64/libril.so vendor/lib64/librilutils.so vendor/lib64/libsaiv_BeautySolutionVideo.so -vendor/lib64/libsavscmn.so vendor/lib64/libsec-ril-dsds.so vendor/lib64/libsec-ril.so vendor/lib64/libsecaudioinfo.so vendor/lib64/libsecnativefeature.so -vendor/lib64/libsecure_storage.so vendor/lib64/libsensorlistener.so vendor/lib64/libsensorndkbridge.so vendor/lib64/libskeymaster3device.so -vendor/lib64/libsnap_caffe.so -vendor/lib64/libsnap_caffe_wrapper.so -vendor/lib64/libsnap_compute.so -vendor/lib64/libsnap_compute_wrapper.so -vendor/lib64/libsnap_vndk.so -vendor/lib64/libsomxcore_vendor.so vendor/lib64/libstagefrighthw.so -vendor/lib64/libswldc_capture_core.camera.samsung.so vendor/lib64/libsynaFpSensorTestNwd.so vendor/lib64/libuniapi.so vendor/lib64/libuniplugin.so vendor/lib64/libvideobeauty_interface.so -vendor/lib64/libvkmanager_vendor.so -vendor/lib64/libvkservice.so vendor/lib64/libvndsecril-client.so vendor/lib64/libwifi-hal.so vendor/lib64/libwpa_client.so vendor/lib64/libwrappergps.so -vendor/lib64/libxcv.camera.samsung.so vendor/lib64/libyasalgo.so vendor/lib64/omx/libOMX.Exynos.AVC.Decoder.so vendor/lib64/omx/libOMX.Exynos.AVC.Encoder.so diff --git a/universal7904-common.mk b/universal7904-common.mk index a1ce9f6..3df86dd 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -162,7 +162,6 @@ PRODUCT_COPY_FILES += \ # Shims PRODUCT_PACKAGES += \ - libshim_stagefright_foundation \ libcamera_metadata_helper # Soong namespaces