diff options
| author | Sai Cheemalapati <saicheems@google.com> | 2014-06-18 13:53:56 -0700 |
|---|---|---|
| committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-20 15:34:03 -0700 |
| commit | 14462b65dee767d897219d685d41357c9b78c33f (patch) | |
| tree | 66c4adb629e11cb43e348b1ebb46df1fab0afa86 /Android.mk | |
| parent | f8a8854eeb749bee419144ab8076aa75119017be (diff) | |
| download | android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.tar.gz android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.tar.bz2 android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.zip | |
Update Emergency Dialer to match Dialer (6/7).
Emergency dialer style updated to match style in Dialer and
InCallUI.
Moved all dialpad resources to PhoneCommon.
Change-Id: Id68e48c63fade3138c3fd5ede9c4e55b5f5b9da1
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b12d32ed0..17c748ac4 100644 --- a/Android.mk +++ b/Android.mk @@ -4,16 +4,26 @@ LOCAL_PATH:= $(call my-dir) # for the 'other' dialer. include $(CLEAR_VARS) +phone_common_dir := ../../apps/PhoneCommon + +src_dirs := src $(phone_common_dir)/src +res_dirs := res $(phone_common_dir)/res + LOCAL_JAVA_LIBRARIES := telephony-common voip-common -LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.shared \ +LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.services.telephony.common \ guava \ -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_SRC_FILES += \ src/com/android/phone/EventLogTags.logtags \ src/com/android/phone/INetworkQueryService.aidl \ src/com/android/phone/INetworkQueryServiceCallback.aidl +LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) + +LOCAL_AAPT_FLAGS := \ + --auto-add-overlay \ + --extra-packages com.android.phone.common LOCAL_PACKAGE_NAME := TeleService |