diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:51:17 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:51:17 -0700 |
| commit | 7e1e5aa73dfed14100a2d9258a398ec506a2e464 (patch) | |
| tree | 40db8576835c6f6d2d50699215c631706a802bb4 /Android.mk | |
| parent | 2789b8de52a65b1ec20d4e5c2ade1a16c3df26e0 (diff) | |
| parent | bba49f028651ad1f8d568237dac85d5c21c97b74 (diff) | |
Merge Android Pie into master
Bug: 112104996
Change-Id: I8472e263b260d8e0cd257f02abbdfb349e995ad1
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 538991986..1b9735f88 100644 --- a/Android.mk +++ b/Android.mk @@ -48,6 +48,11 @@ EXCLUDE_FILES += \ $(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \ $(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java \ +# * b/62875795 +ifneq ($(wildcard packages/apps/Dialer/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java),) +$(error Please remove file packages/apps/Dialer/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java ) +endif + EXCLUDE_RESOURCE_DIRECTORIES := \ java/com/android/incallui/maps/impl/res \ @@ -131,7 +136,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-core-ui \ - android-support-design \ + $(ANDROID_SUPPORT_DESIGN_TARGETS) \ android-support-transition \ android-support-v13 \ android-support-v4 \ |