Switch Dialer to use new third_party bubble library
This CL switches Dialer to use the new common bubble libary. It also moves the
integration tests into the bubble libary.
Bug: 64797730
Test: BubbleIntegrationTest
PiperOrigin-RevId: 167439680
Change-Id: Ie2e9367cb6a6561efb8abd425b6a12f8c1e78138
diff --git a/Android.mk b/Android.mk
index db0aed4..2c511e1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,14 +15,6 @@
# The base directory for Dialer sources.
BASE_DIR := java/com/android
-# Primary dialer module sources.
-SRC_DIRS := \
- $(BASE_DIR)/contacts/common \
- $(BASE_DIR)/dialer \
- $(BASE_DIR)/dialershared \
- $(BASE_DIR)/incallui \
- $(BASE_DIR)/voicemail
-
# Exclude files incompatible with AOSP.
EXCLUDE_FILES := \
$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \
@@ -76,8 +68,8 @@
LOCAL_FULL_LIBS_MANIFEST_FILES := \
$(addprefix $(LOCAL_PATH)/, $(DIALER_MANIFEST_FILES))
-LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS))
-LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS))
+LOCAL_SRC_FILES := $(call all-java-files-under, $(BASE_DIR))
+LOCAL_SRC_FILES += $(call all-proto-files-under, $(BASE_DIR))
LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)
@@ -93,6 +85,7 @@
# 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.bubble \
com.android.contacts.common \
com.android.dialer.about \
com.android.dialer.app \
@@ -131,7 +124,6 @@
com.android.dialer.searchfragment.list \
com.android.dialer.searchfragment.nearbyplaces \
com.android.dialer.searchfragment.remote \
- com.android.dialershared.bubble \
com.android.dialer.shortcuts \
com.android.dialer.simulator.impl \
com.android.dialer.speeddial \
@@ -233,7 +225,7 @@
# Proguard includes
-LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(SRC_DIRS))
+LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(BASE_DIR))
LOCAL_PROGUARD_ENABLED := custom
LOCAL_PROGUARD_ENABLED += optimization
@@ -255,7 +247,6 @@
# Cleanup local state
BASE_DIR :=
-SRC_DIRS :=
EXCLUDE_FILES :=
RES_DIRS :=
DIALER_MANIFEST_FILES :=