summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-10-17 16:24:58 -0700
committer Colin Cross <ccross@android.com> 2018-10-17 16:24:58 -0700
commitc31dc3f21ffe3b26dc69ff68b513485750b84cfc (patch)
tree3683e11ee245a8dc54952625298749ca2ef633d4
parenta7998431d4f41fe88e23e4e88cb39314f6e9d6ed (diff)
Use static_libs for androidx dependencies
androidx dependencies should always be static, and Soong is changing to match Make and not include resources from libraries in libs. Test: m checkbuild Change-Id: I478856e7d4d380f5d2623885e04d3923716b68e9
-rw-r--r--packages/SettingsLib/Android.bp4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index d60dbe783fcd..5161344a4946 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -2,16 +2,14 @@ android_library {
name: "SettingsLib",
- libs: [
+ static_libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
"androidx.preference_preference",
"androidx.appcompat_appcompat",
"androidx.lifecycle_lifecycle-runtime",
- ],
- static_libs: [
"SettingsLibHelpUtils",
"SettingsLibRestrictedLockUtils",
"SettingsLibAppPreference",