commit 12122444dbf307b49b4b32bd1452d7946efe91ae
author Alan Viverette <alanv@google.com> Mon Feb 12 15:42:33 2018 -0500
committer Colin Cross <ccross@android.com> Thu May 10 22:04:23 2018 -0700
tree c3be4bd449cdf6a6fe3fbd6f0b3253911fd703b0
parent ce32ecde38fdc7c9043c7cf6aa64e60cc5d5b109

Migrate to AAPT2

Fix duplicate gray color.

Bug: 73128633
Test: make checkbuild
Change-Id: I43f6142bf29cdd701bf0762a65c2603df899ca92
Merged-In: I43f6142bf29cdd701bf0762a65c2603df899ca92
(cherry picked from commit feace435c8f0e1467958f33dcb88df2747030eaf)

Android.mk

diff --git a/Android.mk b/Android.mk
index f5a5510..ad31233 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,8 @@
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
+LOCAL_USE_AAPT2 := true
+
 LOCAL_PACKAGE_NAME := ManagedProvisioning
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 154245d..7c3044d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
     <color name="black_text_secondary">#757575</color>
     <color name="black_toolbar">#2D2D2D</color>
     <color name="blue">#4285F4</color>
-    <color name="gray">#EEE</color>
+    <color name="gray2">#EEE</color>
     <color name="gray_button_focused">#c0c0c0</color>
     <color name="gray_button_text">#8A000000</color>
     <color name="gray_divider">#DCDCDC</color>