commit 0f68a71a0f7914d1f7534fdd58cc96644d59d47b
author Jay Shrauner <shrauner@google.com> Wed Jul 16 16:13:57 2014 -0700
committer Jay Shrauner <shrauner@google.com> Wed Jul 16 16:13:57 2014 -0700
tree 79231dfd59dcc1f4197399d730e040343621a8e9
parent 0c41ef04d2d5ad0bbe5f498f9492052a4a4725b8

Fix directory import order

Change src + res directory import order to put InCallUi before ContactsCommon.

Bug:16300823
Change-Id: Idbf3ef268c6d91b346ecdbccefc454326b7ae0e5

Android.mk

diff --git a/Android.mk b/Android.mk
index c72c019..414ea2f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,20 +3,27 @@
 
 LOCAL_MODULE_TAGS := optional
 
+incallui_dir := ../InCallUI
 contacts_common_dir := ../ContactsCommon
 phone_common_dir := ../PhoneCommon
-incallui_dir := ../InCallUI
 
-src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res $(phone_common_dir)/res
+src_dirs := src \
+    $(incallui_dir)/src \
+    $(contacts_common_dir)/src \
+    $(phone_common_dir)/src
+
+res_dirs := res \
+    $(incallui_dir)/res \
+    $(contacts_common_dir)/res \
+    $(phone_common_dir)/res
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
-    --extra-packages com.android.contacts.common \
     --extra-packages com.android.incallui \
+    --extra-packages com.android.contacts.common \
     --extra-packages com.android.phone.common
 
 LOCAL_JAVA_LIBRARIES := telephony-common