diff options
-rw-r--r-- | Android.mk | 9 | ||||
-rw-r--r-- | CleanSpec.mk | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index a9cc38f64..ee01630ae 100644 --- a/Android.mk +++ b/Android.mk @@ -4,20 +4,21 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional contacts_common_dir := ../ContactsCommon +phone_common_dir := ../PhoneCommon -src_dirs := src $(contacts_common_dir)/src -res_dirs := res $(contacts_common_dir)/res +src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src +res_dirs := 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.contacts.common \ + --extra-packages com.android.phone.common LOCAL_JAVA_LIBRARIES := telephony-common voip-common LOCAL_STATIC_JAVA_LIBRARIES := \ - com.android.phone.shared \ com.android.vcard \ android-common \ guava \ diff --git a/CleanSpec.mk b/CleanSpec.mk index b84e1b65e..63f1939b4 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -47,3 +47,4 @@ # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Contacts_intermediates) |