diff options
| author | 2023-08-25 22:59:33 +0000 | |
|---|---|---|
| committer | 2023-08-25 22:59:33 +0000 | |
| commit | f080d0cc8a02f4ac8a110f033b738ef4ae82a5c4 (patch) | |
| tree | 043093210655dc663884503eedcc223413e074ee | |
| parent | 89cf9b07663599b0746184ffd2292d76fcde42d3 (diff) | |
| parent | 1020850d4a6a4719fe70fe253da03d671d0bae5f (diff) | |
Merge "Restructure camera platform flags" into main
| -rw-r--r-- | AconfigFlags.bp | 12 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/camera_platform.aconfig | 8 | ||||
| -rw-r--r-- | services/core/Android.bp | 1 |
3 files changed, 4 insertions, 17 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index e394857795cf..7005349abd7e 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -19,7 +19,7 @@ java_defaults { // 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 @@ java_defaults { } // 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 67f63001ab58..000000000000 --- 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 66a77a36dca9..ba3ee43ebac1 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -192,6 +192,7 @@ java_library_static { "power_optimization_flags_lib", "notification_flags_lib", "pm_flags_lib", + "camera_platform_flags_core_java_lib", ], javac_shard_size: 50, javacflags: [ |