Provide java_defaults as a counterpart to the settings.mk file

To be used during the Android.mk->Android.bp conversion.

Test: treehugger
Change-Id: I9e57744737430ff7e1ab57891dc81d1dd3bbcb83
This commit is contained in:
Sasha Smundak
2019-01-27 17:34:57 -08:00
parent 05cc3aa962
commit 0f019d083e
2 changed files with 21 additions and 2 deletions

View File

@@ -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",
],
}

View File

@@ -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 \