gta4xl-common: build camera provider from source
Change-Id: I0cf78b60b06f1ee5e7755e8dda0350e24e0d1fc2
diff --git a/extract-files.sh b/extract-files.sh
index d3739ab..fa04202 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -63,7 +63,7 @@
vendor/lib/vndk/libstagefright_omx_utils.so)
"${PATCHELF}" --add-needed libshim_stagefright_foundation.so "${2}"
;;
- vendor/lib/libsensorlistener.so)
+ vendor/lib*/libsensorlistener.so)
"${PATCHELF}" --add-needed libshim_sensorndkbridge.so "${2}"
;;
esac
diff --git a/manifest.xml b/manifest.xml
index f6d491e..86d3356 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -276,16 +276,6 @@
<fqname>@2.0::ISehBluetooth/default</fqname>
</hal>
<hal format="hidl">
- <name>vendor.samsung.hardware.camera.provider</name>
- <transport>hwbinder</transport>
- <version>3.0</version>
- <interface>
- <name>ISehCameraProvider</name>
- <instance>legacy/0</instance>
- </interface>
- <fqname>@3.0::ISehCameraProvider/legacy/0</fqname>
- </hal>
- <hal format="hidl">
<name>vendor.samsung.hardware.gnss</name>
<transport>hwbinder</transport>
<version>2.0</version>
diff --git a/platform/product_packages.mk b/platform/product_packages.mk
index 5f152ff..4c87058 100644
--- a/platform/product_packages.mk
+++ b/platform/product_packages.mk
@@ -30,10 +30,7 @@
### CAMERA
PRODUCT_PACKAGES += \
- android.hardware.camera.provider@2.4 \
- android.hardware.camera.provider@2.5 \
- android.hardware.camera.provider@2.4-legacy \
- android.hardware.camera.provider@2.5-legacy
+ android.hardware.camera.provider@2.5-service_64
PRODUCT_PACKAGES += \
Snap
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 0813391..e77b6e0 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -72,34 +72,20 @@
vendor/etc/wifi/mx140_bt.hcf
# CAMERA
-vendor/etc/init/vendor.samsung.hardware.camera.provider@3.0-service.rc
-vendor/bin/hw/vendor.samsung.hardware.camera.provider@3.0-service
vendor/lib/hw/camera.exynos9611.so
-vendor/lib/hw/vendor.samsung.hardware.camera.provider@3.0-impl.so
vendor/lib/camera.device@1.0-impl.so
vendor/lib/camera.device@3.2-impl.so
vendor/lib/camera.device@3.3-impl.so
vendor/lib/camera.device@3.4-impl.so
vendor/lib/camera.device@3.5-impl.so
vendor/lib/libexynoscamera_plugin.so
-vendor/lib/vendor.samsung.camera.device@1.0-impl.so
-vendor/lib/vendor.samsung.camera.device@4.0-impl.so
-vendor/lib/vendor.samsung.hardware.camera.device@1.0.so
-vendor/lib/vendor.samsung.hardware.camera.device@4.0.so
-vendor/lib/vendor.samsung.hardware.camera.provider@3.0.so
vendor/lib64/hw/camera.exynos9611.so
-vendor/lib64/hw/vendor.samsung.hardware.camera.provider@3.0-impl.so
vendor/lib64/camera.device@1.0-impl.so
vendor/lib64/camera.device@3.2-impl.so
vendor/lib64/camera.device@3.3-impl.so
vendor/lib64/camera.device@3.4-impl.so
vendor/lib64/camera.device@3.5-impl.so
vendor/lib64/libexynoscamera_plugin.so
-vendor/lib64/vendor.samsung.camera.device@1.0-impl.so
-vendor/lib64/vendor.samsung.camera.device@4.0-impl.so
-vendor/lib64/vendor.samsung.hardware.camera.device@1.0.so
-vendor/lib64/vendor.samsung.hardware.camera.device@4.0.so
-vendor/lib64/vendor.samsung.hardware.camera.provider@3.0.so
# CAMERA_DEPENDENCIES
vendor/lib/libSEF.quram.so
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 7af931b..71488ec 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -71,7 +71,6 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.exynos9611 u:object_r:hal_usb_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator@[0-9]\.[0-9]-service\.samsung u:object_r:hal_vibrator_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.camera\.provider@[0-9]\.[0-9]-service u:object_r:hal_camera_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0
/(vendor|system/vendor)/lib(64)?/hw/gralloc\.exynos[0-9]*\.so u:object_r:same_process_hal_file:s0
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 795360d..ff9d0b7 100644
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -1,6 +1,5 @@
# hwservice_contexts
-vendor.samsung.hardware.camera.provider::ISehCameraProvider u:object_r:hal_camera_hwservice:s0
vendor.samsung.hardware.gnss::ISehGnss u:object_r:hal_gnss_hwservice:s0
vendor.samsung.hardware.radio.bridge::ISehBridge u:object_r:hal_telephony_hwservice:s0
vendor.samsung.hardware.radio.channel::ISehChannel u:object_r:hal_telephony_hwservice:s0