diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-16 19:22:24 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-17 19:21:59 +0000 |
| commit | 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed (patch) | |
| tree | 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30 /Android.mk | |
| parent | 2df4538eb90b896be15eebc1d9adf1206131c8a3 (diff) | |
| download | android_packages_apps_Dialer-9a090c89e7a0c43a668bd6e2ac5e5e680f323aed.tar.gz android_packages_apps_Dialer-9a090c89e7a0c43a668bd6e2ac5e5e680f323aed.tar.bz2 android_packages_apps_Dialer-9a090c89e7a0c43a668bd6e2ac5e5e680f323aed.zip | |
Update AOSP Dialer source from internal google3 repository at cl/150392808
Test: Treehugger
Notable this release:
* Reintroduce localization.
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from 3/15/2017 to cl/150392808 (3/16/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 2eddb56d2..83aedda6b 100644 --- a/Android.mk +++ b/Android.mk @@ -1,6 +1,14 @@ # Local modifications: -# * Dagger classes have been manually crafted. -# * Precompiled proto classes have been included. +# * b/36287059 Dagger classes have been manually crafted. +# * b/31757757 Precompiled proto classes have been included. +# * b/36215428 dialer/oem/res/values-mcc3* have been pruned +# * b/36383971 StubCallLocationModule modified to return null. +# * removed com.google.android.backup.api_key. This should be added to +# the manifest in the top level directory. +# * removed com.google.android.geo.API_KEY key. This should be added to +# the manifest files in java/com/android/incallui/calllocation/impl/ +# and /java/com/android/incallui/maps/impl/ +# * b/35391680 apache temporarily included in the top level directory. LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -95,7 +103,6 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/dialer/app/manifests/activities/AndroidManifest.xml \ $(BASE_DIR)/dialer/app/voicemail/error/AndroidManifest.xml \ $(BASE_DIR)/dialer/backup/AndroidManifest.xml \ - $(BASE_DIR)/dialer/binary/aosp/AndroidManifest.xml \ $(BASE_DIR)/dialer/blocking/AndroidManifest.xml \ $(BASE_DIR)/dialer/callcomposer/AndroidManifest.xml \ $(BASE_DIR)/dialer/callcomposer/camera/AndroidManifest.xml \ |