eleven: Stop using prebuilt support libs

 * For some unknown reason, this copy of the library is crashing
   in the Palette code when we build with Jack.
 * Just use the system version.

Change-Id: I8ad03beeaf11c659e75d7bf3d17288065c5b44bc

3 files changed, 4 insertions, 6 deletions

diff --git a/Android.mk b/Android.mk
index 206db89..a2d46e5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,13 +14,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v7-palette \
     android-support-v7-cardview \
     android-common \
-    eleven_support_v4 \
-    eleven_recyclerview \
+    android-support-v4 \
+    android-support-v7-recyclerview \
     guava
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
-    --extra-packages android.support.v7.cardview
+    --extra-packages android.support.v7.cardview \
+    --extra-packages android.support.v7.recyclerview
 
 LOCAL_PACKAGE_NAME := Eleven
 LOCAL_OVERRIDES_PACKAGES := Music
@@ -36,7 +37,4 @@ include $(BUILD_PACKAGE)
 
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    eleven_recyclerview:libs/android-support-v7-recyclerview.jar \
-    eleven_support_v4:libs/android-support-v4-21.jar
 include $(BUILD_MULTI_PREBUILT)
diff --git a/libs/android-support-v4-21.jar b/libs/android-support-v4-21.jar
deleted file mode 100644
index c31cede..0000000
--- a/libs/android-support-v4-21.jar
+++ /dev/null
diff --git a/libs/android-support-v7-recyclerview.jar b/libs/android-support-v7-recyclerview.jar
deleted file mode 100644
index 1786ede..0000000
--- a/libs/android-support-v7-recyclerview.jar
+++ /dev/null