diff options
| author | 2019-02-07 23:03:02 +0000 | |
|---|---|---|
| committer | 2019-02-07 23:03:02 +0000 | |
| commit | ad8b5c993948cf696d4dfcaa5d636b6d3d4f3c62 (patch) | |
| tree | 57c1cca25be62adf08c9e5ce012397292b34502d | |
| parent | 90f86257f0f5b83325708b370bb8d60399915eb6 (diff) | |
| parent | 1109a1f65a6ce0276328e394cb8b3e2537128a54 (diff) | |
Merge "Provide java_defaults as a counterpart to the settings.mk file"
| -rw-r--r-- | packages/SettingsLib/Android.bp | 16 | ||||
| -rw-r--r-- | packages/SettingsLib/common.mk | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 4791517d9273..0cae894e89a6 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -22,4 +22,20 @@ android_library { } +// 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", + ], +} + // For the test package. 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 \ |