summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-11-22 08:28:58 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-11-22 08:28:58 +0000
commit2335a579b25e292f42d62277e937f1c6f5835512 (patch)
tree6aa8ec950f0fb5e9d3bbb7e90903884fca61d8e8
parent1ee0c68ebbb783ef9568ab12831b2c13a17221aa (diff)
parent14f482d1b5315cde7d7c8629b3525222186ac35e (diff)
downloaddatetimepicker-2335a579b25e292f42d62277e937f1c6f5835512.tar.gz
Snap for 4464948 from 14f482d1b5315cde7d7c8629b3525222186ac35e to pi-release
Change-Id: I4ec2d778a5b54239962a3c32dfff5e97a6d1309e
-rw-r--r--Android.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 71027e5..d84220d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android-opt-datetimepicker
-LOCAL_SDK_VERSION := 17
+LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
@@ -25,7 +25,14 @@ LOCAL_SRC_FILES := \
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_USE_AAPT2 := true
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-annotations
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-core-utils \
+ android-support-core-ui
LOCAL_PROGUARD_FLAG_FILES := proguard.flags