commit b82ce5be987fbae68ce3c52e772cbe0654db4fe3
author Colin Cross <ccross@android.com> Mon May 07 17:53:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 07 17:53:09 2018 +0000
tree 7ded0e261124b6896654ec1a4bc8b1fe73c5cdb1
parent e2984e35e933f8b804a1007f0ab6031f9c707450
parent d26be5b4da5234992add9146508c280a6f7d2774

Merge "Migrate android-opt-datetimepicker to aapt2."

Android.mk

diff --git a/Android.mk b/Android.mk
index 71027e5..d84220d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@
 
 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_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