Removing car code from phone SettingsIntelligence
AAOS specific code is to be split out into its own package to remove the
phone dependencies on car code.
Bug: 174688736
Test: manual (app still functions properly on sdk_gphone_x86)
Change-Id: I1a7969aef5819ff510e5db5c0716e3a18aa6dc88
diff --git a/Android.bp b/Android.bp
index 0a0ca56..475be42 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,6 +29,28 @@
],
}
+android_library {
+ name: "SettingsIntelligence-core",
+ sdk_version: "system_current",
+ srcs: [
+ "src/**/*.java",
+ "proto/**/*.proto",
+ ],
+
+ static_libs: [
+ "androidx.legacy_legacy-support-v4",
+ "androidx.legacy_legacy-support-v13",
+ "androidx.appcompat_appcompat",
+ "androidx.cardview_cardview",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ "androidx.legacy_legacy-preference-v14",
+ ],
+ proto: {
+ type: "nano",
+ },
+}
+
android_app {
name: "SettingsIntelligence",
optimize: {
@@ -39,23 +61,6 @@
privileged: true,
required: ["privapp_whitelist_com.android.settings.intelligence"],
- libs: ["android.car-stubs"],
- static_libs: [
- "androidx.legacy_legacy-support-v4",
- "androidx.legacy_legacy-support-v13",
- "androidx.appcompat_appcompat",
- "androidx.cardview_cardview",
- "androidx.preference_preference",
- "androidx.recyclerview_recyclerview",
- "androidx.legacy_legacy-preference-v14",
- "car-ui-lib",
- ],
- resource_dirs: ["res"],
- srcs: [
- "src/**/*.java",
- "proto/**/*.proto",
- ],
- proto: {
- type: "nano",
- },
+ static_libs: ["SettingsIntelligence-core"],
+ resource_dirs: [],
}