Restructure camera platform flags
- Move flags file to frameworks/av and rename it
- Add access to camera platform flags to system service
Test: With dependent patch, verified flag values are logged as expected
Bug: 297375200
Change-Id: I12060e64570e86862f426549d9742aae063ade8a
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index e394857..7005349 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -19,7 +19,7 @@
// Add java_aconfig_libraries to here to add them to the core framework
srcs: [
":android.security.flags-aconfig-java{.generated_srcjars}",
- ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
+ ":camera_platform_flags_core_java_lib{.generated_srcjars}",
":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
":com.android.text.flags-aconfig-java{.generated_srcjars}",
],
@@ -34,15 +34,9 @@
}
// Camera
-aconfig_declarations {
- name: "com.android.hardware.camera2-aconfig",
- package: "com.android.hardware.camera2",
- srcs: ["core/java/android/hardware/camera2/camera_platform.aconfig"],
-}
-
java_aconfig_library {
- name: "com.android.hardware.camera2-aconfig-java",
- aconfig_declarations: "com.android.hardware.camera2-aconfig",
+ name: "camera_platform_flags_core_java_lib",
+ aconfig_declarations: "camera_platform_flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
diff --git a/core/java/android/hardware/camera2/camera_platform.aconfig b/core/java/android/hardware/camera2/camera_platform.aconfig
deleted file mode 100644
index 67f6300..0000000
--- a/core/java/android/hardware/camera2/camera_platform.aconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-package: "com.android.hardware.camera2"
-
-flag {
- namespace: "camera_platform"
- name: "initial_test_flag"
- description: "Flag infrastructure test flag"
- bug: "292631208"
-}
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 66a77a3..ba3ee43 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -192,6 +192,7 @@
"power_optimization_flags_lib",
"notification_flags_lib",
"pm_flags_lib",
+ "camera_platform_flags_core_java_lib",
],
javac_shard_size: 50,
javacflags: [