commit afdde6b42823426f6ecfdbad8acdf345c7b40f1f
author Colin Cross <ccross@android.com> Wed Feb 15 20:37:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 15 20:37:03 2017 +0000
tree 06552b25c81227a730b42ec108fb93ee7f305080
parent 0b111ab7c7cd9478dfa4fd5dfaaeee4be314d9fa
parent 40f13876cd2e159fd9368008c9795f6f8e96b883

Merge "Add missing transitive dependencies" am: ec520cf757
am: 40f13876cd

Change-Id: I200740e8a425fbe83b87680b0abab5a4425545a4

Android.mk

diff --git a/Android.mk b/Android.mk
index f1ac919..9cd0d9f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,7 @@
 ifeq ($(TARGET_BUILD_APPS),)
 LOCAL_RESOURCE_DIR += frameworks/support/design/res
 LOCAL_RESOURCE_DIR += frameworks/support/percent/res
+LOCAL_RESOURCE_DIR += frameworks/support/transition/res
 LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res
 LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
 LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
@@ -15,6 +16,7 @@
 else
 LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res
 LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res
+LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/transition/res
 LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/preference/res
 LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res
 LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
@@ -37,6 +39,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
@@ -47,6 +50,7 @@
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages android.support.design
 LOCAL_AAPT_FLAGS += --extra-packages android.support.percent
+LOCAL_AAPT_FLAGS += --extra-packages android.support.transition
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout