commit 604bf1f1857801b6404049383609b0aee7a5f8d9
author Yohann Roussel <yroussel@google.com> Wed Aug 21 14:21:57 2013 +0200
committer Yohann Roussel <yroussel@google.com> Thu Jul 17 16:44:30 2014 +0200
tree fa75a5e56ca5d2f94a9c9dec7c044abac8239112
parent 37feee2abc4f975962fbfab4052834800669964e

Include android-support-multidex in SDK libs.

(cherry picked from commit 9e27887b60e2e3ae1ea94a8c093e6e493f72c8e4)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index f8578d2..89bee2b 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -143,7 +143,8 @@
     android-support-v7-gridlayout \
     android-support-v7-appcompat \
     android-support-v7-mediarouter \
-    android-support-v13
+    android-support-v13 \
+    android-support-multidex
 
 $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))