From 0a5abcd7d05c31de925baccc8a3e94a1ec73dfe1 Mon Sep 17 00:00:00 2001
From: Stephen Bird <sbird@cyngn.com>
Date: Fri, 8 Apr 2016 10:47:26 -0700
Subject: Fix rebase errors

Change-Id: I13e9e433b922a291cd3674e701dc5ec432ce7f91
---
 Android.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index ea7f55c12..72f1e3888 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,14 +12,12 @@ src_dirs := src \
     $(incallui_dir)/src \
     $(contacts_common_dir)/src \
     $(phone_common_dir)/src \
-    $(phone_common_dir)/src-ambient \
-    $(uicommon_dir)/src
+    $(phone_common_dir)/src-ambient
 
 res_dirs := res \
     $(incallui_dir)/res \
     $(contacts_common_dir)/res \
-    $(phone_common_dir)/res \
-    $(uicommon_dir)/res
+    $(phone_common_dir)/res
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) $(call all-Iaidl-files-under, $(src_dirs))
 LOCAL_SRC_FILES += ../../providers/ContactsProvider/src/com/android/providers/contacts/NameSplitter.java \
@@ -27,12 +25,16 @@ LOCAL_SRC_FILES += ../../providers/ContactsProvider/src/com/android/providers/co
                    ../../providers/ContactsProvider/src/com/android/providers/contacts/util/NeededForTesting.java
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
     frameworks/support/v7/cardview/res \
-    frameworks/support/v7/recyclerview/res
+    frameworks/support/v7/recyclerview/res \
+    frameworks/support/v7/appcompat/res \
+    frameworks/support/design/res
 
 LOCAL_ASSET_DIR += $(LOCAL_PATH)/assets
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
+    --extra-packages android.support.design \
+    --extra-packages android.support.v7.appcompat \
     --extra-packages android.support.v7.cardview \
     --extra-packages android.support.v7.recyclerview \
     --extra-packages android.support.v7.appcompat \
@@ -50,8 +52,10 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest_cm.xml
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-common \
+    android-support-design \
     android-support-v13 \
     android-support-v4 \
+    android-support-v7-appcompat \
     android-support-v7-cardview \
     android-support-v7-recyclerview \
     android-support-design \
-- 
cgit v1.2.3