summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-04-06 23:16:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-06 23:16:42 +0000
commit28188020060d1ad3304dfa0367486ff5bb35da62 (patch)
tree8d08d4f2292aa84dc435d455891e7ab633d95a25 /Android.mk
parent34e183cfd77f68e0ade42d2080c76f54a319430d (diff)
parent01a86435499d66b267765f89b7dd9c83c158ddfe (diff)
Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a
am: 01a8643549 Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b5b71988e..9602ab8f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,6 +66,7 @@ RES_DIRS := \
$(BASE_DIR)/dialer/phonenumberutil/res \
$(BASE_DIR)/dialer/postcall/res \
$(BASE_DIR)/dialer/shortcuts/res \
+ $(BASE_DIR)/dialer/speeddial/res \
$(BASE_DIR)/dialer/theme/res \
$(BASE_DIR)/dialer/util/res \
$(BASE_DIR)/dialer/voicemailstatus/res \
@@ -84,6 +85,7 @@ RES_DIRS := \
$(BASE_DIR)/incallui/res \
$(BASE_DIR)/incallui/sessiondata/res \
$(BASE_DIR)/incallui/video/impl/res \
+ $(BASE_DIR)/incallui/video/protocol/res \
$(BASE_DIR)/incallui/wifi/res \
$(BASE_DIR)/voicemail/impl/res
@@ -112,6 +114,7 @@ DIALER_MANIFEST_FILES += \
$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \
$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \
$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \
+ $(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \
$(BASE_DIR)/dialer/theme/AndroidManifest.xml \
$(BASE_DIR)/dialer/util/AndroidManifest.xml \
$(BASE_DIR)/dialer/voicemailstatus/AndroidManifest.xml \
@@ -129,6 +132,7 @@ DIALER_MANIFEST_FILES += \
$(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \
$(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \
$(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \
+ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \
$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \
$(BASE_DIR)/voicemail/impl/AndroidManifest.xml
@@ -179,6 +183,7 @@ LOCAL_AAPT_FLAGS := \
--extra-packages com.android.dialer.phonenumberutil \
--extra-packages com.android.dialer.postcall \
--extra-packages com.android.dialer.shortcuts \
+ --extra-packages com.android.dialer.speeddial \
--extra-packages com.android.dialer.util \
--extra-packages com.android.dialer.voicemailstatus \
--extra-packages com.android.dialer.widget \