Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Provide java_defaults as a counterpart to the settings.mk file"

Browse Source 
am: ad8b5c9939

Change-Id: Ia4e52707d858457ebbcfdaa14c27b978eee7f4d1
This commit is contained in:
Alexander Smundak
2019-02-07 15:21:57 -08:00
committed by android-build-merger
parent b4cd2e4135 ad8b5c9939
commit 9870b5659b
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsLib/Android.bp
View File

@@ -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. // For the test package.

5
packages/SettingsLib/common.mk
View File

@@ -12,6 +12,11 @@
# #
# include frameworks/base/packages/SettingsLib/common.mk # 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 += \ LOCAL_STATIC_JAVA_LIBRARIES += \
androidx.annotation_annotation \ androidx.annotation_annotation \