summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorShinichiro Hamaji <hamaji@google.com>2016-04-07 18:28:30 +0900
committerShinichiro Hamaji <hamaji@google.com>2016-04-14 15:21:51 +0900
commitaa7dc685efb6ce80633b88d30f3b788a2c849452 (patch)
tree50033c57a99469f3b438f92610b3e245f520b89c /Android.mk
parentfc922a1f53193535d16cdb6c50d24bb1ad862229 (diff)
downloadandroid_packages_apps_Messaging-aa7dc685efb6ce80633b88d30f3b788a2c849452.tar.gz
android_packages_apps_Messaging-aa7dc685efb6ce80633b88d30f3b788a2c849452.tar.bz2
android_packages_apps_Messaging-aa7dc685efb6ce80633b88d30f3b788a2c849452.zip
Let Messaging dex depend on proguard flag file
The dex file will have the proguard flag file as an input after this change. Bug: 27954979 Change-Id: Ib584a38a6e8c6b744d604392de955cc3e928a040
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index e2ed18b..06ac9e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,11 +64,11 @@ else
LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
endif
-LOCAL_PROGUARD_FLAGS := -ignorewarnings -include build/core/proguard_basic_keeps.flags
+LOCAL_PROGUARD_FLAGS := -ignorewarnings
LOCAL_PROGUARD_ENABLED := nosystem
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := ../../../build/core/proguard_basic_keeps.flags proguard.flags
ifeq (eng,$(TARGET_BUILD_VARIANT))
LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
else