commit 078ea36b81d6a9abbd1608f16bdebe0a42725a37
author Jon Miranda <jonmiranda@google.com> Thu Jan 25 18:09:12 2018 -0800
committer Jon Miranda <jonmiranda@google.com> Thu Jan 25 18:09:12 2018 -0800
tree 2f683eb87066ea8f961cc01857d3953ad12e65f2
parent 15a9264941c78a48799d433562176dbc55db52b2

Update Android.mk so WallpaperPicker2 compiles.

Change-Id: I8b5ede71032f7f6578c5c33d0fcd649e67cd6258

Android.mk

diff --git a/Android.mk b/Android.mk
index 396801a..26cd2ea 100755
--- a/Android.mk
+++ b/Android.mk
@@ -47,7 +47,9 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_USE_AAPT2 := true
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v7-appcompat \
     android-support-v7-cardview \
@@ -55,7 +57,9 @@
     android-support-compat \
     android-support-design \
     android-support-exifinterface \
-    android-support-media-compat \
+    android-support-media-compat
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
     wallpaper2-glide-target \
     wallpaper2-disklrucache-target \
     wallpaper2-gifdecoder-target \
@@ -66,14 +70,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     $(call all-java-files-under, src_override) \
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
-    prebuilts/sdk/current/support/v7/appcompat/res \
-    prebuilts/sdk/current/support/v7/cardview/res \
-    prebuilts/sdk/current/support/v7/recyclerview/res \
-    prebuilts/sdk/current/support/compat/res \
-    prebuilts/sdk/current/support/core-ui/res \
-    prebuilts/sdk/current/support/design/res \
-    prebuilts/sdk/current/support/media-compat/res \
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := disabled
@@ -90,7 +87,7 @@
     --extra-packages android.support.mediacompat \
     --extra-packages android.support.transition
 
-LOCAL_SDK_VERSION := 27
+LOCAL_SDK_VERSION := current
 LOCAL_PACKAGE_NAME := WallpaperPicker2
 
 include $(BUILD_PACKAGE)