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

Merge "Clean up legacy androidx lib for SettingsLib"

Browse Source
This commit is contained in:
Chaohui Wang
2022-07-15 03:11:40 +00:00
committed by Android (Google) Code Review
parent 496afc58c9 c269f228ed
commit 8db944d294
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SettingsLib/Android.bp
View File

@@ -13,12 +13,15 @@ android_library {
static_libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
"androidx.preference_preference",
"androidx.appcompat_appcompat",
"androidx.coordinatorlayout_coordinatorlayout",
"androidx.core_core",
"androidx.fragment_fragment",
"androidx.lifecycle_lifecycle-runtime",
"androidx.mediarouter_mediarouter-nodeps",
"androidx.loader_loader",
"androidx.localbroadcastmanager_localbroadcastmanager",
"androidx.preference_preference",
"androidx.recyclerview_recyclerview",
"com.google.android.material_material",
"iconloader",
@@ -74,13 +77,15 @@ 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",
"androidx.coordinatorlayout_coordinatorlayout",
"androidx.core_core",
"androidx.fragment_fragment",
"androidx.lifecycle_lifecycle-runtime",
"androidx.loader_loader",
"androidx.localbroadcastmanager_localbroadcastmanager",
"androidx.preference_preference",
"androidx.recyclerview_recyclerview",
"SettingsLib",
],
}

16
packages/SettingsLib/common.mk
View File

@@ -19,15 +19,17 @@
# NOTE: keep this file and ./Android.bp in sync.
LOCAL_STATIC_JAVA_LIBRARIES += \
androidx.annotation_annotation \
androidx.lifecycle_lifecycle-common
androidx.annotation_annotation
LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx.legacy_legacy-support-v4 \
androidx.lifecycle_lifecycle-runtime \
androidx.recyclerview_recyclerview \
androidx.preference_preference \
androidx.appcompat_appcompat \
androidx.legacy_legacy-preference-v14 \
androidx.coordinatorlayout_coordinatorlayout \
androidx.core_core \
androidx.fragment_fragment \
androidx.lifecycle_lifecycle-runtime \
androidx.loader_loader \
androidx.localbroadcastmanager_localbroadcastmanager \
androidx.preference_preference \
androidx.recyclerview_recyclerview \
SettingsLib