From 938468da6f5c225ebb161a68bd949c9cf3261892 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 24 Oct 2017 14:05:52 -0700 Subject: Rename the new bubble package name from "bubble" to "newbubble". It fixes AOSP for package name conflict. Test: manual PiperOrigin-RevId: 173298696 Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081 --- Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 82f745f61..f47452baf 100644 --- a/Android.mk +++ b/Android.mk @@ -39,10 +39,6 @@ EXCLUDE_FILES += \ # Exclude build variants for now EXCLUDE_FILES += \ - $(BASE_DIR)/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java \ - $(BASE_DIR)/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java \ - $(BASE_DIR)/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java \ - $(BASE_DIR)/dialer/buildtype/test/BuildTypeAccessorImpl.java \ $(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \ $(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \ $(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java \ @@ -156,6 +152,7 @@ LOCAL_AAPT_FLAGS := \ com.android.incallui.telecomeventui \ com.android.incallui.video.impl \ com.android.incallui.video.protocol \ + com.android.newbubble \ com.android.voicemail \ com.android.voicemail.impl \ com.android.voicemail.impl.configui \ -- cgit v1.2.3