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

Commit ae70f8c1 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Eino-Ville Talvala (Eddy)
Browse files

Camera: Add initial flagging support 

- Add core aconfig file into frameworks/av/camera
- Add various flag libraries for use across camera stack

Test: Manual:
 - Test flag library can be called in camera service
 - Test flag can be flipped by tooling
Bug: 297375200
Change-Id: Ic008f6442a27f0fe5579a1f18b5e9470754b8db4
parent aa96f9d8

camera/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -43,6 +43,22 @@ license { 
    ],

}



aconfig_declarations {

    name: "camera_platform_flags",

    package: "com.android.internal.camera.flags",

    srcs: ["camera_platform.aconfig"],

}



cc_aconfig_library {

    name: "camera_platform_flags_c_lib",

    aconfig_declarations: "camera_platform_flags",

}



java_aconfig_library {

    name: "camera_platform_flags_java_lib",

    aconfig_declarations: "camera_platform_flags",

}



cc_library_headers {

    name: "camera_headers",

    export_include_dirs: ["include"],

camera/camera_platform.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.internal.camera.flags"



flag {

     namespace: "camera_platform"

     name: "initial_test_flag"

     description: "Flag infrastructure test flag"

     bug: "292631208"

}

services/camera/libcameraservice/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ cc_defaults { 
        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.graphics.common-V4-ndk",

        "media_permission-aidl-cpp",

        "server_configurable_flags",

    ],



    static_libs: [
@@ -105,12 +106,13 @@ cc_defaults { 
        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "camera_platform_flags_c_lib",

        "libaidlcommonsupport",

        "libbinderthreadstateutils",

        "libcameraservice_device_independent",

        "libdynamic_depth",

        "libprocessinfoservice_aidl",

        "libbinderthreadstateutils",

        "media_permission-aidl-cpp",

        "libcameraservice_device_independent",

    ],

}