summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ted Bauer <tedbauer@google.com> 2024-06-13 15:39:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-13 15:39:01 +0000
commit0ce81affea9d9d98d2ec797f8b1b1ede6bbce959 (patch)
treeb5a797dff7b2dde700c2fb47de19db49813d7c47
parent936249baab0bc5f587d308ca670f45332b510a7c (diff)
parent2bdc64067a4b4c5bcd5c696a06fe4b13049b57ba (diff)
Merge "Load aconfig demo flags in system partition" into main am: 2bdc64067a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3128315 Change-Id: Ib5c8f4aaf4422e25dca0d0c3e3ce0c2dc876385c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SettingsProvider/Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp
index 732b404cdccb..07c481785170 100644
--- a/packages/SettingsProvider/Android.bp
+++ b/packages/SettingsProvider/Android.bp
@@ -32,6 +32,7 @@ android_library {
"unsupportedappusage",
],
static_libs: [
+ "aconfig_demo_flags_java_lib",
"device_config_service_flags_java",
"libaconfig_java_proto_lite",
"SettingsLibDeviceStateRotationLock",