commit 415ed980f4dd438d04483ad689613ea42ff682a2
author Ta-wei Yen <twyen@google.com> Mon Jan 11 21:23:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 11 21:23:30 2016 +0000
tree 34d8115abc767a90c31dc78c0dd2b09e7ceca480
parent 581174b0695555f414f8a8fa7a12803c422f1d9e
parent 90a13e94e3d918da73e83d80ab12c6e5f3f76f7e

Allow google dialer code to be compiled against M and N SDKs
am: 90a13e94e3

* commit '90a13e94e3d918da73e83d80ab12c6e5f3f76f7e':
  Allow google dialer code to be compiled against M and N SDKs

Android.mk

diff --git a/Android.mk b/Android.mk
index 47648db..20f3944 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,12 @@
     $(contacts_common_dir)/res \
     $(phone_common_dir)/res
 
+src_dirs += \
+    src-N \
+    $(incallui_dir)/src-N \
+    $(contacts_common_dir)/src-N \
+    $(phone_common_dir)/src-N
+
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
     $(support_library_root_dir)/v7/cardview/res \