taoyao: Separating camera to different repo

2025-09-29 16:23:36 -03:00
parent 7e83e77680
commit d6fc245e5a
18 changed files with 10 additions and 167 deletions
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -89,8 +89,6 @@ TARGET_KERNEL_NO_GCC := true
 TARGET_KERNEL_SOURCE := kernel/xiaomi/taoyao
 TARGET_KERNEL_CONFIG := vendor/taoyao-qgki_defconfig

-include device/xiaomi/taoyao-kernel/BoardConfig.mk
-
 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0
 BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom
 BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3
@@ -105,6 +103,8 @@ BOARD_KERNEL_CMDLINE += iptable_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += ip6table_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += androidboot.init_fatal_reboot_target=recovery

+-include device/xiaomi/taoyao-kernel/BoardConfig.mk
+
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_BOOTIMAGE_PARTITION_SIZE := 201326592
@@ -140,7 +140,6 @@ TARGET_BOARD_PLATFORM := lahaina

 # Properties
 TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop
-TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
@@ -205,3 +204,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X

 # Inherit proprietary blobs
 include vendor/xiaomi/taoyao/BoardConfigVendor.mk
+
+# Inherit camera proprietary blobs
+-include device/xiaomi/taoyao-camera/BoardConfig.mk
--- a/configs/default-permissions-miuicamera.xml
+++ b/configs/default-permissions-miuicamera.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<exceptions>
-    <exception package="com.android.camera">
-        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="true" />
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true" />
-        <permission name="android.permission.ACCESS_MEDIA_LOCATION" fixed="true" />
-        <permission name="android.permission.CAMERA" fixed="true" />
-        <permission name="android.permission.INTERACT_ACROSS_USERS" fixed="true" />
-        <permission name="android.permission.PACKAGE_USAGE_STATS" fixed="true" />
-        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-        <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="true" />
-        <permission name="android.permission.READ_PHONE_STATE" fixed="true" />
-        <permission name="android.permission.RECORD_AUDIO" fixed="true" />
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="true" />
-        <permission name="android.permission.WRITE_MEDIA_STORAGE" fixed="true" />
-        <permission name="android.permission.WRITE_SECURE_SETTINGS" fixed="true" />
-    </exception>
-</exceptions>
--- a/configs/idc/uinput-goodix.idc
+++ b/configs/idc/uinput-goodix.idc
@@ -1,16 +0,0 @@
-#
-# FPC1020 Touch sensor driver
-#
-# Copyright (c) 2013,2014 Fingerprint Cards AB <tech@fingerprints.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License Version 2
-# as published by the Free Software Foundation.
-#
-
-device.internal = 1
-
-keyboard.layout = uinput-goodix
-keyboard.builtIn = 1
-keyboard.orientationAware = 1
-
--- a/configs/keylayout/gpio-keys.kl
+++ b/configs/keylayout/gpio-keys.kl
@@ -1,32 +0,0 @@
-# Copyright (c) 2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-key 115   VOLUME_UP
-key 114   VOLUME_DOWN
-key 102   HOME
-key 528   FOCUS
-key 766   CAMERA
--- a/configs/keylayout/uinput-goodix.kl
+++ b/configs/keylayout/uinput-goodix.kl
@@ -1,19 +0,0 @@
-#
-# FPC1020 Touch sensor driver
-#
-# Copyright (c) 2013,2014 Fingerprint Cards AB <tech@fingerprints.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License Version 2
-# as published by the Free Software Foundation.
-#
-
-#single click
-key  353    DPAD_CENTER  VIRTUAL
-#double click
-key  306    BUTTON_C     VIRTUAL
-# HOME --> DPAD_CENTER
-key  102   DPAD_CENTER  VIRTUAL
-#key 105   DPAD_LEFT    VIRTUAL
-#key  106   DPAD_RIGHT   VIRTUAL
-
--- a/configs/miuicamera-hiddenapi-package-allowlist.xml
+++ b/configs/miuicamera-hiddenapi-package-allowlist.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.android.camera" />
-</config>
--- a/configs/privapp-permissions-miuicamera.xml
+++ b/configs/privapp-permissions-miuicamera.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.android.camera">
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.LOG_COMPAT_CHANGE" />
-        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
-        <permission name="android.permission.SYSTEM_CAMERA" />
-        <permission name="android.permission.TURN_SCREEN_ON" />
-        <permission name="android.permission.WRITE_MEDIA_STORAGE" />
-        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
-    </privapp-permissions>
-</permissions>
--- a/configs/public.libraries-xiaomi.txt
+++ b/configs/public.libraries-xiaomi.txt
@@ -1,2 +0,0 @@
-libcamera_algoup_jni.xiaomi.so
-libcamera_mianode_jni.xiaomi.so
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 # Inherit proprietary targets
 $(call inherit-product, vendor/xiaomi/taoyao/taoyao-vendor.mk)

+# Inherit camera proprietary targets
+$(call inherit-product-if-exists, device/xiaomi/taoyao-camera/device.mk)
+
 # Setup dalvik vm configs
 $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)

@@ -119,11 +122,7 @@ PRODUCT_PACKAGES += \
    android.hardware.graphics.common-V4-ndk

 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/camera_cnf.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/camera_cnf.txt \
-    $(LOCAL_PATH)/configs/privapp-permissions-miuicamera.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-miuicamera.xml \
-    $(LOCAL_PATH)/configs/public.libraries-xiaomi.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/public.libraries-xiaomi.txt \
-    $(LOCAL_PATH)/configs/miuicamera-hiddenapi-package-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/miuicamera-hiddenapi-package-allowlist.xml \
-    $(LOCAL_PATH)/configs/default-permissions-miuicamera.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/default-permissions/default-permissions-miuicamera.xml
+    $(LOCAL_PATH)/configs/camera_cnf.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/camera_cnf.txt

 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 \
@@ -260,12 +259,6 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/rootdir/bin/init.qcom.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.sh \
    $(LOCAL_PATH)/rootdir/bin/vendor_modprobe.sh:$(TARGET_COPY_OUT_VENDOR)/bin/vendor_modprobe.sh

-# Input
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/idc/uinput-goodix.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-goodix.idc \
-    $(LOCAL_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl \
-    $(LOCAL_PATH)/configs/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl
-
 # IFAA manager
 PRODUCT_PACKAGES += \
     IFAAService
@@ -284,7 +277,7 @@ PRODUCT_COPY_FILES += \

 # Kernel
 PRODUCT_ENABLE_UFFD_GC := true
-$(call inherit-product, device/xiaomi/taoyao-kernel/device.mk)
+$(call inherit-product-if-exists, device/xiaomi/taoyao-kernel/device.mk)

 # Lineage Health
 PRODUCT_PACKAGES += \
@@ -349,7 +342,6 @@ DEVICE_PACKAGE_OVERLAYS += \
 PRODUCT_ENFORCE_RRO_TARGETS := *

 PRODUCT_PACKAGES += \
-    NfcOverlay \
    SettingsProviderOverlay \
    DeviceAsWebcamOverlaySM8350

--- a/extract-files.py
+++ b/extract-files.py
@@ -97,13 +97,6 @@ blob_fixups: blob_fixups_user_type = {
        .binary_regex_replace(b'system/lib64/libion.so', b'vendor/lib64/libion.so'),
    'vendor/etc/camera/taoyao_motiontuning.xml': blob_fixup()
        .regex_replace('xml=version', 'xml version'),
-    'system/lib64/libmicampostproc_client.so': blob_fixup()
-        .remove_needed('libhidltransport.so'),
-    'system/lib64/libcamera_algoup_jni.xiaomi.so': blob_fixup()
-        .add_needed('libcamera_shim.so')
-        .sig_replace('08 AD 40 F9', '08 A9 40 F9'),
-    'system/lib64/libcamera_mianode_jni.xiaomi.so': blob_fixup()
-        .add_needed('libcamera_shim.so'),
    ('vendor/lib/hw/audio.primary.lahaina.so', 'vendor/lib/libaudioroute_ext.so'): blob_fixup()
        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
    # Dolby START
--- a/product.prop
+++ b/product.prop
@@ -1,2 +0,0 @@
-# Camera
-ro.product.mod_device=taoyao_global
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -166,11 +166,6 @@ vendor/lib64/libjnihelper.so
 vendor/lib64/vendor.qti.hardware.cacert@1.0.so

 # Camera
-product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=Aperture,Camera2
-system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so
-system_ext/lib64/libcamera_mianode_jni.xiaomi.so:system/lib64/libcamera_mianode_jni.xiaomi.so
-system_ext/lib64/libmicampostproc_client.so:system/lib64/libmicampostproc_client.so
-system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
 vendor/bin/loadalgo
 vendor/lib/libcamxexternalformatutils.so
 vendor/lib/libcom.xiaomi.debug.so
--- a/sepolicy/vendor/cameraserver.te
+++ b/sepolicy/vendor/cameraserver.te
@@ -2,5 +2,3 @@ allow cameraserver property_socket:sock_file { write };

 allow cameraserver sysfs_leds:dir r_dir_perms;
 allow cameraserver sysfs_torch:file rw_file_perms;
-
-allow cameraserver vendor_default_prop:file { getattr open read map };
--- a/sepolicy/vendor/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
@@ -18,9 +18,3 @@ allow hal_camera_client vendor_hal_cameraperf_hwservice:hwservice_manager find;
 allow hal_camera_client vendor_hal_camerapostproc_xiaomi_hwservice:hwservice_manager find;

 allow hal_camera_default public_adsprpcd_file:file r_file_perms;
-
-allow hal_camera_default proc_stat:file { open read };
-allow hal_camera_default system_data_file:dir { add_name search write };
-allow hal_camera_default system_data_file:file { create write setattr open read getattr };
-allow hal_camera_default vendor_hal_qspmhal_hwservice:hwservice_manager find;
-binder_call(hal_camera_default, platform_app);
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -1,6 +1 @@
 set_prop(vendor_init, vendor_zram_prop);
-
-allow vendor_init vendor_camera_prop:property_service set;
-
-allow vendor_init default_prop:property_service set;
-allow vendor_init tmpfs:dir rw_dir_perms;
--- a/shims/Android.bp
+++ b/shims/Android.bp
@@ -4,11 +4,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //

-cc_library {
-    name: "libcamera_shim",
-    srcs: ["libcamera.c"],
-}
-
 cc_library {
    name: "citsensorservice_shim",
    srcs: ["citsensorservice.c"],
--- a/shims/libcamera.c
+++ b/shims/libcamera.c
@@ -1,9 +0,0 @@
-/*
- * Copyright (C) 2023 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-void _ZN7android18BnProducerListener16onBufferDetachedEi() {
-    return;
-}
--- a/system.prop
+++ b/system.prop
@@ -1,12 +1,6 @@
 # Bluetooth
 vendor.bluetooth.soc=hastings

-# Camera
-persist.vendor.camera.privapp.list=com.android.camera
-ro.com.google.lens.oem_camera_package=com.android.camera
-ro.miui.notch=1
-vendor.camera.aux.packagelist=com.android.camera
-
 # CNE
 persist.vendor.cne.feature=1