Fix EmergencyInfo dependencies am: a970392437 am: 58b164a8a4
am: fe69d5f560
Change-Id: I2cc0ec55e84d0a1133d51a35d59421f79f67294a
diff --git a/Android.mk b/Android.mk
index 36f98ad..0f983d7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,22 +22,24 @@
endif
LOCAL_MODULE_TAGS := eng
-LOCAL_JAVA_LIBRARIES := framework
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v14-preference \
android-support-v13 \
android-support-v7-appcompat \
- android-support-v7-preference \
- android-support-v7-recyclerview \
- android-support-v4 \
- android-support-design
+ android-support-v7-preference \
+ android-support-v7-recyclerview \
+ android-support-v4 \
+ android-support-design \
+ android-support-transition
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
- $(support_library_root_dir)/v7/appcompat/res \
- $(support_library_root_dir)/v7/preference/res \
- $(support_library_root_dir)/v7/recyclerview/res \
- $(support_library_root_dir)/v14/preference/res \
- $(support_library_root_dir)/design/res
+ $(support_library_root_dir)/v7/appcompat/res \
+ $(support_library_root_dir)/v7/preference/res \
+ $(support_library_root_dir)/v7/recyclerview/res \
+ $(support_library_root_dir)/v14/preference/res \
+ $(support_library_root_dir)/v14/preference/res \
+ $(support_library_root_dir)/design/res \
+ $(support_library_root_dir)/transition/res
include frameworks/base/packages/SettingsLib/common.mk
LOCAL_AAPT_FLAGS := --auto-add-overlay \
@@ -45,9 +47,9 @@
--extra-packages android.support.v14.preference \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.recyclerview \
- --extra-packages android.support.design
+ --extra-packages android.support.design \
+ --extra-packages android.support.transition
-LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := EmergencyInfo
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
