summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAndroid Dialer <noreply@google.com>2017-11-12 01:02:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-12 01:02:45 +0000
commitc3fab28d848922024940ae50a90a9698d1ec823e (patch)
tree38546f94976d187f311e37e96a340a52c86bd2e0 /Android.mk
parent93808dc59021960f816bad07c0d1bb70af4d22fd (diff)
parentfeb132de24472b5261a85e5e9f3009c12d97fff9 (diff)
downloadandroid_packages_apps_Dialer-c3fab28d848922024940ae50a90a9698d1ec823e.tar.gz
android_packages_apps_Dialer-c3fab28d848922024940ae50a90a9698d1ec823e.tar.bz2
android_packages_apps_Dialer-c3fab28d848922024940ae50a90a9698d1ec823e.zip
Merge changes I0ed4fa1b,Ie03ce41e,If41868df,Iba2e9092 am: 2b52d2a3cd am: f2805eaaba
am: feb132de24 Change-Id: Ied4da8d740d0a3872b3624a7462a4bdcb8cd0f4d
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 654dd3317..105b791df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -86,6 +86,8 @@ EXCLUDE_EXTRA_PACKAGES := \
# We specify each package explicitly to glob resource files.
# find . -type f -name "AndroidManifest.xml" | uniq | sort | cut -c 8- | rev | cut -c 21- | rev | sed 's/\//./g' | sed 's/$/ \\/'
LOCAL_AAPT_FLAGS := \
+ com.android.assets.product \
+ com.android.assets.quantum \
com.android.bubble \
com.android.contacts.common \
com.android.dialer.about \
@@ -121,8 +123,11 @@ LOCAL_AAPT_FLAGS := \
com.android.dialer.main.impl \
com.android.dialer.notification \
com.android.dialer.oem \
+ com.android.dialer.phonelookup.database \
com.android.dialer.phonenumberutil \
com.android.dialer.postcall \
+ com.android.dialer.precall.impl \
+ com.android.dialer.preferredsim.impl \
com.android.dialer.searchfragment.common \
com.android.dialer.searchfragment.cp2 \
com.android.dialer.searchfragment.list \
@@ -134,7 +139,7 @@ LOCAL_AAPT_FLAGS := \
com.android.dialer.theme \
com.android.dialer.util \
com.android.dialer.voicemail.listui \
- com.android.dialer.voicemail.settings \
+ com.android.dialer.voicemail.settings \
com.android.dialer.voicemailstatus \
com.android.dialer.widget \
com.android.incallui \