From 10713dcecea7bdcb70cd6d25f6d9cb7b6b89dfa0 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Wed, 21 Aug 2013 14:19:44 +0200 Subject: [PATCH] Generates SDK stubs of android-support-multidex (cherry picked from commit c4441b8c3701147365213a1f789626a8d442db6e) Conflicts: core/pathmap.mk Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f --- core/pathmap.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/pathmap.mk b/core/pathmap.mk index 28661c27f..2b97dbfdc 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -110,7 +110,8 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ v7/appcompat \ v7/mediarouter \ v8/renderscript \ - v13 + v13 \ + multidex # # A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from