diff options
| -rw-r--r-- | packages/SettingsLib/Android.bp | 18 | ||||
| -rw-r--r-- | packages/SettingsLib/common.mk | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 2321790fa960..0972340bbb48 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -19,7 +19,7 @@ android_library { "SettingsLibLayoutPreference", "SettingsLibActionButtonsPreference", "SettingsLibEntityHeaderWidgets", - "SettingsLibBarChartPreference" + "SettingsLibBarChartPreference", ], // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES @@ -33,4 +33,18 @@ android_library { } -// For the test package. +// NOTE: Keep this module in sync with ./common.mk +java_defaults { + name: "SettingsLibDefaults", + static_libs: [ + "androidx.annotation_annotation", + "androidx.lifecycle_lifecycle-common", + "androidx.legacy_legacy-support-v4", + "androidx.lifecycle_lifecycle-runtime", + "androidx.recyclerview_recyclerview", + "androidx.preference_preference", + "androidx.appcompat_appcompat", + "androidx.legacy_legacy-preference-v14", + "SettingsLib", + ], +} diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 834b83b49ada..8c309ff97370 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -12,6 +12,11 @@ # # include frameworks/base/packages/SettingsLib/common.mk # +# During the conversion to Soong bluprint files, the equivalent +# functionality is provided by adding +# defaults: ["SettingsLibDefaults"], +# to the corresponding module. +# NOTE: keep this file and ./Android.bp in sync. LOCAL_STATIC_JAVA_LIBRARIES += \ androidx.annotation_annotation \ |