diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-12 00:55:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-12 00:55:34 +0000 |
| commit | 2b52d2a3cdcb0ac00d87d2c2cbd1d6b750ea036d (patch) | |
| tree | c87ae220455edeac1c6fb5b12e033e37a07c9ed4 /Android.mk | |
| parent | 5e20ba7b1c6a9644da034b345000b37856d78125 (diff) | |
| parent | b7dba5aaa8c477d97121fc6e3411332e66cbabe8 (diff) | |
Merge changes I0ed4fa1b,Ie03ce41e,If41868df,Iba2e9092
* changes:
Expose tab index to protected
Added temporary logging to debug problem with null phone numbers from remote contacts.
Hook up pre-call actions
Implement CallingAccountSelector and AssistedDialAction
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 9defc7e45..e9841d9dc 100644 --- a/Android.mk +++ b/Android.mk @@ -81,6 +81,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 \ @@ -116,8 +118,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 \ @@ -129,7 +134,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 \ |