commit acdcb3f1e0097b5b188acf0bf4c7174ca9358935
author Aurimas Liutikas <aurimas@google.com> Wed Dec 06 11:39:26 2017 -0800
committer Colin Cross <ccross@android.com> Thu May 03 16:38:17 2018 -0700
tree f55c2fc6403e35a363d54d269045e6fc8ad9e847
parent 64d3a4e28dd41dbd9ac24f8f2c5263f2474eaa13

Migrate Telecom to aapt2.

Test: make -j
Change-Id: I5306d72b2b37ed97b25edde4d032ef194be2df4f
Merged-In: I5306d72b2b37ed97b25edde4d032ef194be2df4f
(cherry picked from commit 2c40ffc63e6dfc2d2eb6c19fda9759d2c319bdce)

Android.mk

diff --git a/Android.mk b/Android.mk
index 5b483c4..4e5eeff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under, proto)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/proto/

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c2db42a..6a7af24 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -45,6 +45,8 @@
         android.test.runner \
         telephony-common
 
+LOCAL_USE_AAPT2 := true
+
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages com.android.server.telecom:android.support.compat