aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-12-11 17:55:06 -0500
committerAlan Viverette <alanv@google.com>2017-12-11 17:55:22 -0500
commit3fba2c44ddd4165a81fe19b891e71464915db01d (patch)
tree0abb005ebb5ee705958a1eb27edfed9c4b7808c0
parent76aa0c2d39104d1f116911072806c38c76a742c6 (diff)
downloadglide-3fba2c44ddd4165a81fe19b891e71464915db01d.tar.gz
Move glide over to new SL libs, aapt2
Test: make Bug: 35994894 Change-Id: I2c21def3e8cf78a9b2590a0a1e5676ff69c02e63
-rw-r--r--Android.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 1a752714..267e9d47 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,11 +7,16 @@ LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_decoder/src)
LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_encoder/src)
LOCAL_MANIFEST_FILE := library/src/main/AndroidManifest.xml
-LOCAL_STATIC_JAVA_LIBRARIES := volley
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_JAVA_LIBRARIES := volley
+
+LOCAL_SHARED_ANDROID_LIBRARIES := \
+ android-support-fragment \
+ android-support-core-ui \
+ android-support-compat
LOCAL_MODULE := glide
LOCAL_MODULE_TAGS := optional
+LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := 19
include $(BUILD_STATIC_JAVA_LIBRARY)