summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhi Dou <zhidou@google.com> 2024-11-12 21:27:53 +0000
committer Zhi Dou <zhidou@google.com> 2024-11-12 21:27:53 +0000
commit272fb96fa1516ba50991bf5fb0f2a1cf2b5d40b9 (patch)
tree2d8f70c5a284b0082e98ad7a7fbe82705b4af63a
parent913e30ed1d4adaee82dbb67dc30bb55628eb786a (diff)
dynamic link to "aconfig_settingslib_flags_java_lib"
"aconfig_settingslib_flags_java_lib" has been added in the framework jar, so the framework should be the source of true of this flag. statically linked to this flag library will cause different versions of the flag library, and at the runtime, if the wrong version is picked, it will crash the device. Change-Id: I65788eeaa4056bff7e28d91114eeb6a242d9009e Test: presubmit Bug: 378409134 Flag: NONE build file change
-rw-r--r--packages/SettingsLib/Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index b2dcb7fa4f53..a3da93da31ae 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -61,9 +61,11 @@ android_library {
"SettingsLibUtils",
"SettingsLibZeroStatePreference",
"settingslib_media_flags_lib",
+ ],
+ libs:[
+ // This flag library has been added in frameworks jar
"aconfig_settingslib_flags_java_lib",
],
-
plugins: ["androidx.room_room-compiler-plugin"],
use_resource_processor: true,
resource_dirs: ["res"],