From e61357b2fc907f6206cd213da030f8c15ed05a30 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 21 Apr 2017 16:07:16 -0400
Subject: Update to use STATIC_ANDROID_LIBRARIES

Test: make Launcher2
Change-Id: I97df2b08bec8aec9707e9b2e2736615159f2e4fe
---
 Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 9906e8dc..fc15f32d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13-prebuilt
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SDK_VERSION := current
@@ -32,8 +35,7 @@ LOCAL_OVERRIDES_PACKAGES := Home
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_USE_AAPT2 := true
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 include $(BUILD_PACKAGE)
-- 
cgit v1.2.3