DO NOT MERGE Snap to latest SettingsIntelligence source
Bug: 67755462
Test: rebuild
Change-Id: Ib606a68c10f83c3a1479f234af19fe840b3120d0
diff --git a/Android.mk b/Android.mk
index 1efed08..b565774 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,14 +24,23 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v4
+ android-support-v4 \
+ android-support-v13 \
+ android-support-v7-appcompat \
+ android-support-v7-cardview \
+ android-support-v7-preference \
+ android-support-v7-recyclerview \
+ android-support-v14-preference
LOCAL_USE_AAPT2 := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
+ $(call all-java-files-under, src) \
+ $(call all-proto-files-under, proto)
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
include $(BUILD_PACKAGE)