diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-16 00:09:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 00:09:31 +0000 |
| commit | c57430a61eab62e88372f386c75989dab6332608 (patch) | |
| tree | b606f1899f80fcd0ea3ee753ce799883d5a673ab /Android.mk | |
| parent | 9842b4a7fd1d852b1353af806da4913b4298d516 (diff) | |
| parent | 0c9dbf507b53a12bdf577ff3e55c1686a2e089de (diff) | |
| download | android_packages_apps_Dialer-c57430a61eab62e88372f386c75989dab6332608.tar.gz android_packages_apps_Dialer-c57430a61eab62e88372f386c75989dab6332608.tar.bz2 android_packages_apps_Dialer-c57430a61eab62e88372f386c75989dab6332608.zip | |
Merge "Update Dialer to v10 RC32" into oc-dev
am: 0c9dbf507b
Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 63f160258..b2372859c 100644 --- a/Android.mk +++ b/Android.mk @@ -45,6 +45,7 @@ RES_DIRS := \ assets/product/res \ assets/quantum/res \ $(BASE_DIR)/contacts/common/res \ + $(BASE_DIR)/dialer/about/res \ $(BASE_DIR)/dialer/app/res \ $(BASE_DIR)/dialer/app/voicemail/error/res \ $(BASE_DIR)/dialer/blocking/res \ @@ -81,6 +82,7 @@ RES_DIRS := \ $(BASE_DIR)/incallui/incall/impl/res \ $(BASE_DIR)/incallui/res \ $(BASE_DIR)/incallui/sessiondata/res \ + $(BASE_DIR)/incallui/telecomeventui/res \ $(BASE_DIR)/incallui/video/impl/res \ $(BASE_DIR)/incallui/video/protocol/res \ $(BASE_DIR)/incallui/wifi/res \ @@ -91,6 +93,7 @@ RES_DIRS := \ # find . -type f -name "AndroidManifest.xml" | uniq | sort DIALER_MANIFEST_FILES += \ $(BASE_DIR)/contacts/common/AndroidManifest.xml \ + $(BASE_DIR)/dialer/about/AndroidManifest.xml \ $(BASE_DIR)/dialer/app/AndroidManifest.xml \ $(BASE_DIR)/dialer/app/manifests/activities/AndroidManifest.xml \ $(BASE_DIR)/dialer/app/voicemail/error/AndroidManifest.xml \ @@ -130,6 +133,7 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/hold/AndroidManifest.xml \ $(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \ + $(BASE_DIR)/incallui/telecomeventui/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \ $(BASE_DIR)/incallui/wifi/AndroidManifest.xml \ @@ -158,6 +162,7 @@ LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages android.support.coreui \ --extra-packages com.android.contacts.common \ + --extra-packages com.android.dialer.about \ --extra-packages com.android.dialer.app \ --extra-packages com.android.dialer.app.voicemail.error \ --extra-packages com.android.dialer.blocking \ @@ -179,6 +184,7 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.dialer.postcall \ --extra-packages com.android.dialer.shortcuts \ --extra-packages com.android.dialer.speeddial \ + --extra-packages com.android.dialer.theme \ --extra-packages com.android.dialer.util \ --extra-packages com.android.dialer.voicemailstatus \ --extra-packages com.android.dialer.widget \ @@ -198,6 +204,7 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.incallui.incall.impl \ --extra-packages com.android.incallui.maps.impl \ --extra-packages com.android.incallui.sessiondata \ + --extra-packages com.android.incallui.telecomeventui \ --extra-packages com.android.incallui.video \ --extra-packages com.android.incallui.video.impl \ --extra-packages com.android.incallui.wifi \ |