Remove unsupported build macros from make.
In some build variants, specifying these resource packages is required.
When adding new packages, the list of included resources will need
to be updated.
Before:
We would dynamically generate package resources to be included when
compiling.
After:
We explicitly enumerate dependent package resources.
Test: build, flash, th
Change-Id: I4bc00949c95fdefd2258a20f01f7fd37dc21ae08
diff --git a/Android.mk b/Android.mk
index 5eb098d..beaa2c5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -89,11 +89,6 @@
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
-define all-dialer-manifest-extra-packages
- $(shell cd $(LOCAL_PATH) ; \
- find . -type f -name "AndroidManifest.xml" | uniq | sort | cut -c 8- | rev | cut -c 21- | rev | sed 's/\//./g')
-endef
-
EXCLUDE_EXTRA_PACKAGES := \
com.android.dialer.binary.aosp.testing \
com.android.dialer.binary.google \
@@ -101,7 +96,80 @@
com.android.incallui.maps.impl \
# We specify each package explicitly to glob resource files.
-LOCAL_AAPT_FLAGS := $(call all-dialer-manifest-extra-packages)
+# 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.contacts.common \
+ com.android.dialer.about \
+ com.android.dialer.app \
+ com.android.dialer.app.manifests.activities \
+ com.android.dialer.app.voicemail.error \
+ com.android.dialer.backup \
+ com.android.dialer.binary.aosp.testing \
+ com.android.dialer.binary.google \
+ com.android.dialer.blocking \
+ com.android.dialer.callcomposer \
+ com.android.dialer.callcomposer.camera \
+ com.android.dialer.callcomposer.camera.camerafocus \
+ com.android.dialer.callcomposer.cameraui \
+ com.android.dialer.calldetails \
+ com.android.dialer.calllog.database \
+ com.android.dialer.calllog.ui \
+ com.android.dialer.calllogutils \
+ com.android.dialer.common \
+ com.android.dialer.configprovider \
+ com.android.dialer.contactactions \
+ com.android.dialer.contactphoto \
+ com.android.dialer.contactsfragment \
+ com.android.dialer.databasepopulator \
+ com.android.dialer.dialpadview \
+ com.android.dialer.enrichedcall.simulator \
+ com.android.dialer.interactions \
+ com.android.dialer.lettertile \
+ com.android.dialer.location \
+ com.android.dialer.main.impl \
+ com.android.dialer.notification \
+ com.android.dialer.oem \
+ com.android.dialer.phonenumberutil \
+ com.android.dialer.postcall \
+ com.android.dialer.searchfragment.common \
+ com.android.dialer.searchfragment.cp2 \
+ 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 \
+ com.android.dialer.theme \
+ com.android.dialer.util \
+ com.android.dialer.voicemail.listui \
+ com.android.dialer.voicemailstatus \
+ com.android.dialer.widget \
+ com.android.incallui \
+ com.android.incallui.answer.impl.affordance \
+ com.android.incallui.answer.impl \
+ com.android.incallui.answer.impl.answermethod \
+ com.android.incallui.answer.impl.hint \
+ com.android.incallui.audioroute \
+ com.android.incallui.autoresizetext \
+ com.android.incallui.calllocation.impl \
+ com.android.incallui.callpending \
+ com.android.incallui.commontheme \
+ com.android.incallui.contactgrid \
+ com.android.incallui.disconnectdialog \
+ com.android.incallui.hold \
+ com.android.incallui.incall.impl \
+ com.android.incallui.maps.impl \
+ com.android.incallui.sessiondata \
+ com.android.incallui.spam \
+ com.android.incallui.speakerbuttonlogic \
+ com.android.incallui.telecomeventui \
+ com.android.incallui.video.impl \
+ com.android.incallui.video.protocol \
+ com.android.voicemail \
+ com.android.voicemail.impl \
+ com.android.voicemail.impl.configui \
+
LOCAL_AAPT_FLAGS := $(filter-out $(EXCLUDE_EXTRA_PACKAGES),$(LOCAL_AAPT_FLAGS))
LOCAL_AAPT_FLAGS := $(addprefix --extra-packages , $(LOCAL_AAPT_FLAGS))
LOCAL_AAPT_FLAGS += \
@@ -174,13 +242,9 @@
LOCAL_PROGUARD_ENABLED := disabled
ifdef LOCAL_JACK_ENABLED
-define all-dialer-proguard-flags
- $(shell cd $(LOCAL_PATH) ; \
- find . -type f -name "proguard.*flags" | uniq | sort | cut -c 3-)
-endef
# Proguard includes
-LOCAL_PROGUARD_FLAG_FILES := $(call all-dialer-proguard-flags)
+LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(SRC_DIRS))
LOCAL_PROGUARD_ENABLED := custom
LOCAL_PROGUARD_ENABLED += optimization