summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-01-06 12:34:55 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-01-06 12:34:55 -0800
commit8447414ff9265b39d0cc69e9ca77487822e85b29 (patch)
treeba3846f1b08b0166b400fdfe1c5275a1f92ba424
parentbdd07b449ccc2c8c351d3b397e17e3c7f99f2723 (diff)
parent431bdb1411c06ea1db0fa95d6741a87410a1baf1 (diff)
Merge "Move flag lib dep to AconfigFlags.bp" into main
-rw-r--r--AconfigFlags.bp1
-rw-r--r--Android.bp1
2 files changed, 1 insertions, 1 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 7947bd4b4348..0b8838ae6abe 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -107,6 +107,7 @@ aconfig_declarations_group {
"com.android.server.flags.services-aconfig-java",
"com.android.text.flags-aconfig-java",
"com.android.window.flags.window-aconfig-java",
+ "configinfra_framework_flags_java_lib",
"conscrypt_exported_aconfig_flags_lib",
"device_policy_aconfig_flags_lib",
"display_flags_lib",
diff --git a/Android.bp b/Android.bp
index d47919c3fafb..9d8c8a69fc18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -408,7 +408,6 @@ java_defaults {
"bouncycastle-repackaged-unbundled",
"com.android.sysprop.foldlockbehavior",
"com.android.sysprop.view",
- "configinfra_framework_flags_java_lib",
"framework-internal-utils",
"dynamic_instrumentation_manager_aidl-java",
// If MimeMap ever becomes its own APEX, then this dependency would need to be removed