Add dependency on android-support-transition
- The android-support-transition library is a transitive dependency required
by the android-support-design library.
- Also added missing support library proguard-rules.pro files.
Test: lunch aosp_x86-eng && make -j32 ANDROID_COMPILE_WITH_JACK=false
Change-Id: I71d6e1f987f44834b40beedb7e53df5ada70af08
diff --git a/Android.mk b/Android.mk
index 1c3fae9..57d521e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
$(support_library_root_dir)/design/res \
+ $(support_library_root_dir)/transition/res \
$(support_library_root_dir)/v7/appcompat/res \
$(support_library_root_dir)/v7/cardview/res \
$(support_library_root_dir)/v7/recyclerview/res
@@ -28,6 +29,7 @@
--extra-packages com.android.contacts.common \
--extra-packages com.android.phone.common \
--extra-packages android.support.design \
+ --extra-packages android.support.transition \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.cardview \
--extra-packages android.support.v7.recyclerview
@@ -35,6 +37,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
android-support-design \
+ android-support-transition \
android-support-v13 \
android-support-v7-appcompat \
android-support-v7-cardview \
@@ -49,7 +52,11 @@
LOCAL_CERTIFICATE := shared
LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := \
+ proguard.flags \
+ ../../../frameworks/support/core-ui/proguard-rules.pro \
+ ../../../frameworks/support/design/proguard-rules.pro \
+ ../../../frameworks/support/v7/recyclerview/proguard-rules.pro
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21