commit 6b50ee3ac08c3168ca20e608b20bacd598ba8336
author Colin Cross <ccross@android.com> Fri Jan 06 12:02:35 2017 -0800
committer Colin Cross <ccross@android.com> Wed Feb 15 10:02:58 2017 -0800
tree 6ed41ec115e6c2b707e0e6814b39a91bff623e75
parent 7314356d5e8dacda884e69ec77152d11d07ebd15

Fix EmergencyInfo dependencies

Don't depend on framework directly, instead remove LOCAL_SDK_VERSION
to compile against the platform.

Add missing transitive dependency on android-support-transition
required by android-support-design.

Test: builds
Change-Id: I4e855d562f26b735664f5308ff99392dee95583f

Android.mk

diff --git a/Android.mk b/Android.mk
index 3ae9a82..5159b84 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,31 +22,33 @@
 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
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
     --extra-packages android.support.v7.preference \
 	--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