commit a05b051a469a6e5fe4cf7bf32cca50d7535c55d1
author Walter Jang <wjang@google.com> Mon Jul 18 17:11:13 2016 -0700
committer Walter Jang <wjang@google.com> Tue Jul 19 12:12:57 2016 -0700
tree d50e14c295524aeacce96d376fc52c63349b144f
parent 0aad572081e72b96e9514c85d8b604c7ff4fe396

Contacts static shortcuts fixes (1/2)

* Set the component package name differently for
  the AOSP and GoogleContacts projects
* Prevent shortcuts from going into the default
  application task by setting taskAffinity=""

Bug 30204775
Bug 30201875

Change-Id: Ie7cb3a88bcc90c706628d151b80d964dd222451e

Android.mk

diff --git a/Android.mk b/Android.mk
index ea1bbdb..f0fdce2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@
 endif
 
 src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
+res_dirs := res res-aosp $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
 asset_dirs := $(contacts_common_dir)/assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))