summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2017-11-21 12:27:43 -0800
committerAurimas Liutikas <aurimas@google.com>2017-11-21 12:27:43 -0800
commit14f482d1b5315cde7d7c8629b3525222186ac35e (patch)
tree6aa8ec950f0fb5e9d3bbb7e90903884fca61d8e8
parent7ddba115b3caf313a0baa896057f6e7b571c5873 (diff)
downloaddatetimepicker-14f482d1b5315cde7d7c8629b3525222186ac35e.tar.gz
Migrate android-opt-datetimepicker to aapt2.
Test: make android-opt-datetimepicker Change-Id: Ia767dad0f3fc4720ea5f0ee9392dc56e86ded104
-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