commit 3c3b6f1dacf3844b3883a5e2bc67ad3480cfd08a
author Wenyi Wang <wenyiw@google.com> Sat Apr 02 13:58:43 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Mon Apr 04 14:15:34 2016 -0700
tree a433585b5c1fa1f00eaaa25ab6cbcd0d3b7d553b
parent ec7cc72cc14387b18d224995fb29169482e2dd4b

Make PeopleActivity extends AppCompatActivity (1/3)

This CL includes a subset of reversion of ag/871001.

This topic of CLs will lead to the following changes in APK sizes:

- GoogleContacts: 8.0MB --> 8.7MB
- GoogleContacts-N: 7.6MB --> 8.2MB

Bug 27687799

Change-Id: Id94598e42a5016badeafee3f4f0dc2a515fc68eb

Android.mk

diff --git a/Android.mk b/Android.mk
index 566e27e..ad13292 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
+    $(support_library_root_dir)/v7/appcompat/res \
     $(support_library_root_dir)/v7/cardview/res
 LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
@@ -27,6 +28,7 @@
     --auto-add-overlay \
     --extra-packages com.android.contacts.common \
     --extra-packages com.android.phone.common \
+    --extra-packages android.support.v7.appcompat \
     --extra-packages android.support.v7.cardview
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -34,6 +36,7 @@
     android-common \
     guava \
     android-support-v13 \
+    android-support-v7-appcompat \
     android-support-v7-cardview \
     android-support-v7-palette \
     android-support-v4 \