diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-11 17:48:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-11 17:48:18 +0000 |
commit | 5c7c9fe90a6f64adefcc86d24c159b50fb4159e3 (patch) | |
tree | 848d8f8b33da563f4a5f7b40c553d7adb227744d /Android.mk | |
parent | 2cb0136378f1e2930b81399da1bd606dc478e0b3 (diff) | |
parent | 3bcea98f1e6d63e22a7b5393b31c2195d3db82b4 (diff) |
Merge "Switch Dialer to use new third_party bubble library"
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index db0aed463..2c511e1e6 100644 --- a/Android.mk +++ b/Android.mk @@ -15,14 +15,6 @@ include $(CLEAR_VARS) # 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 @@ DIALER_MANIFEST_FILES := $(filter-out $(EXCLUDE_MANIFESTS),$(DIALER_MANIFEST_FIL 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 @@ 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.bubble \ com.android.contacts.common \ com.android.dialer.about \ com.android.dialer.app \ @@ -131,7 +124,6 @@ LOCAL_AAPT_FLAGS := \ 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 @@ ifdef LOCAL_JACK_ENABLED # 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 @@ include $(BUILD_PACKAGE) # Cleanup local state BASE_DIR := -SRC_DIRS := EXCLUDE_FILES := RES_DIRS := DIALER_MANIFEST_FILES := |