From 0f019d083ee5e223f923effd2337fc8ea007710f Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Sun, 27 Jan 2019 17:34:57 -0800
Subject: [PATCH] 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
---
 packages/SettingsLib/Android.bp | 18 ++++++++++++++++--
 packages/SettingsLib/common.mk  |  5 +++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 2321790fa960f..0972340bbb481 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -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",
+    ],
+}
diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index 834b83b49ada3..8c309ff97370a 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -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 \