summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-01-12 00:55:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-12 00:55:00 +0000
commit6c63e4dfe44b30a3a0bf6eadec1b61a44e591b3d (patch)
treed9331d84dcd84b693b40330669b0a1649619586b
parente38a3deb4bbcdf22c2e8a02f4c5d9e3fe7a54c24 (diff)
parentf3137f7965ac420bfab6d91d3e948080435ca97d (diff)
downloadandroid_packages_apps_Dialer-6c63e4dfe44b30a3a0bf6eadec1b61a44e591b3d.tar.gz
android_packages_apps_Dialer-6c63e4dfe44b30a3a0bf6eadec1b61a44e591b3d.tar.bz2
android_packages_apps_Dialer-6c63e4dfe44b30a3a0bf6eadec1b61a44e591b3d.zip
Merge "Don't reference directory that doesn't exist" am: 949a78c265 am: 3c87d9716e am: 314b847825
am: f3137f7965 Change-Id: I8c4d737231644fe039eb5db405fb8ce9021fe5b9
-rw-r--r--Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 8aaa9fb8d..02e075ff3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,8 +25,7 @@ res_dirs := res \
$(phone_common_dir)/res
src_dirs += \
- src-N \
- $(contacts_common_dir)/src-N
+ src-N
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \