commit ae70f8c13d4387eaebc22bacb2c629892f807b70
author Eino-Ville Talvala <etalvala@google.com> Fri Aug 18 10:10:55 2023 -0700
committer Eino-Ville Talvala (Eddy) <etalvala@google.com> Fri Aug 25 00:34:06 2023 +0000
tree c0cf4b9c1f4e028990fa6a86f4bbf016d85145cd
parent aa96f9d8a2293d9c6214b5a70f8883fe01bcee90

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

camera/Android.bp

diff --git a/camera/Android.bp b/camera/Android.bp
index a3fd7f9..e5ae954 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -43,6 +43,22 @@
     ],
 }
 
+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

diff --git a/camera/camera_platform.aconfig b/camera/camera_platform.aconfig
new file mode 100644
index 0000000..fc11518
--- /dev/null
+++ b/camera/camera_platform.aconfig
@@ -0,0 +1,8 @@
+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

diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 84dcf26..ea467e7 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -85,6 +85,7 @@
         "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 @@
         "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",
     ],
 }