DO NOT MERGE Break dependency on car-apps-common.
This dependency was only used to supply a TextAppearance attribute. The
style that depended on this was actually overriding most of the style
anyway.
Also, remove "include" of make files; instead, specify that dependency
directly.
Bug: 78886311
Test: Build and deploy Settings
Change-Id: Ica6a65b51d763c719659d0a98c90b142bcf43698
diff --git a/Android.mk b/Android.mk
index 3b81ede..66658b0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,13 +28,16 @@
LOCAL_USE_AAPT2 := true
+ LOCAL_JAVA_LIBRARIES += android.car
+
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-car \
android-support-v7-preference \
android-support-v14-preference \
- car-apps-common \
car-list \
- car-settings-lib
+ car-settings-lib \
+ setup-wizard-lib-gingerbread-compat \
+ SettingsLib
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res
@@ -53,10 +56,6 @@
LOCAL_DX_FLAGS := --multi-dex
- include packages/services/Car/car-support-lib/car-support.mk
- include frameworks/opt/setupwizard/library/common-gingerbread.mk
- include frameworks/base/packages/SettingsLib/common.mk
-
include $(BUILD_PACKAGE)
endif