Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11d81b0 authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

Merge branch '719devices-t-FP5_fpcam' into 'v1-t' 

FP5: Include FPCamera

See merge request !6
parents e11d30c4 e484462b

BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ VENDOR_SECURITY_PATCH := 2024-06-05 
# SELinux

include device/qcom/sepolicy_vndr-legacy-um/SEPolicy.mk

BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor

SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public

SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private



# Verified Boot

BOARD_AVB_ENABLE := true

configs/privapp-permissions-fpcam.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2016 The Android Open Source 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

  -->

<permissions>

    <privapp-permissions package="com.fp5.camera">

         <permission name="android.permission.SYSTEM_CAMERA"/>

         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>

         <permission name="android.permission.STOP_APP_SWITCHES"/>

         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

         <permission name="android.permission.INTERACT_ACROSS_USERS"/>

         <permission name="android.permission.CHANGE_CONFIGURATION"/>

    </privapp-permissions>

</permissions>

device.mk

+8 −6
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ PRODUCT_PACKAGES += \ 
    vendor.qti.hardware.camera.device@1.0.vendor \

    vendor.qti.hardware.camera.postproc@1.0.vendor



PRODUCT_PACKAGES += \

    FairphoneCameraService



PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \

    frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
@@ -149,10 +152,7 @@ PRODUCT_PACKAGES += \ 
    android.hardware.renderscript@1.0-impl \

    init.qti.display_boot.sh \

    init.qti.display_boot.rc \

    libdisplayconfig.qti \

    libqdMetaData \

    libsdmcore \

    libsdmutils \

    libtinyxml \

    libvulkan \

    memtrack.default \
@@ -194,6 +194,10 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml



# FPCamera

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/configs/privapp-permissions-fpcam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-fpcam.xml



# Gatekeeper

PRODUCT_PACKAGES += \

    android.hardware.gatekeeper@1.0.vendor
@@ -241,6 +245,7 @@ PRODUCT_PACKAGES += \ 
    init.bt_mac.rc \

    init.qcom.rc \

    init.qcom.recovery.rc \

    init.qti.media.rc \

    init.qcom.usb.rc \

    init.stnfc.rc \

    init.target.rc \
@@ -264,17 +269,14 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \

    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \

    $(LOCAL_PATH)/media/media_codecs_performance_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_iot.xml \

    $(LOCAL_PATH)/media/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \

    $(LOCAL_PATH)/media/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \

    $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \

    $(LOCAL_PATH)/media/media_codecs_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_iot.xml \

    $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v0.xml \

    $(LOCAL_PATH)/media/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \

    $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \

    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \

    $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \

    $(LOCAL_PATH)/media/media_profiles_yupik_iot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_iot.xml \

    $(LOCAL_PATH)/media/media_profiles_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \

    $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml



PRODUCT_COPY_FILES += \

extract-files.sh

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ function blob_fixup() { 
        vendor/etc/libnfc-hal-st.conf)

            sed -i 's|STNFC_HAL_LOGLEVEL=.*|STNFC_HAL_LOGLEVEL=0x12|g' "${2}"

            ;;

        vendor/etc/camera/camxoverridesettings.txt)

            sed -i '$aexposeFullSizeForQCFA=TRUE' "${2}"

            ;;

    esac

}

init/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ prebuilt_etc { 
    recovery: true,

}



prebuilt_etc {

    name: "init.qti.media.rc",

    src: "init.qti.media.rc",

    sub_dir: "init",

    vendor: true,

}



prebuilt_etc {

    name: "init.target.rc",

    src: "init.target.rc",