OSDN Git Service

Update pathmap.mk for renderscript support library migration
authorAlan Viverette <alanv@google.com>
Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)
committerColin Cross <ccross@android.com>
Fri, 23 Dec 2016 01:32:20 +0000 (17:32 -0800)
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c818de16be3a0c74f6dc07c85b94b7b0)

core/pathmap.mk

index ce1754e..c328e58 100644 (file)
@@ -114,7 +114,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
         v7/cardview \
         v7/mediarouter \
         v7/palette \
-        v8/renderscript \
         v13 \
         v17/leanback \
         design \
@@ -141,6 +140,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \
 FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
        $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
        $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
+        frameworks/rs/support \
         frameworks/support/graphics/drawable/animated \
         frameworks/support/graphics/drawable/static \
        frameworks/support/v7/appcompat/src \
@@ -156,6 +156,7 @@ FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
     android-support-animatedvectordrawable \
     android-support-v7-appcompat \
     android-support-v7-recyclerview \
+    android-support-v8-renderscript \
     android-support-multidex \
     android-support-multidex-instrumentation