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

Merge "Seperate WifiTrackerLib from other components." into rvc-dev

Browse Source
This commit is contained in:
Steven Liu
2020-03-09 16:14:39 +00:00
committed by Android (Google) Code Review
parent 7103ff4a7d cbbf56d7a7
commit 7e863266aa
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SettingsLib/Android.bp
View File

@@ -2,6 +2,30 @@ android_library {
name: "SettingsLib",
defaults: [
"SettingsLibDependenciesWithoutWifiTracker",
],
// TODO(b/149540986): revert this change.
static_libs: [
// All other dependent components should be put in
// "SettingsLibDependenciesWithoutWifiTracker".
"WifiTrackerLib",
],
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
// LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
resource_dirs: ["res"],
srcs: ["src/**/*.java", "src/**/*.kt"],
min_sdk_version: "21",
}
java_defaults {
name: "SettingsLibDependenciesWithoutWifiTracker",
static_libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-v4",
@@ -25,20 +49,9 @@ android_library {
"SettingsLibProgressBar",
"SettingsLibAdaptiveIcon",
"SettingsLibRadioButtonPreference",
"WifiTrackerLib",
"SettingsLibDisplayDensityUtils",
"SettingsLibSchedulesProvider",
],
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
// LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
resource_dirs: ["res"],
srcs: ["src/**/*.java", "src/**/*.kt"],
min_sdk_version: "21",
}
// NOTE: Keep this module in sync with ./common.mk