commit aa7dc685efb6ce80633b88d30f3b788a2c849452
author Shinichiro Hamaji <hamaji@google.com> Thu Apr 07 18:28:30 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Thu Apr 14 15:21:51 2016 +0900
tree 50033c57a99469f3b438f92610b3e245f520b89c
parent fc922a1f53193535d16cdb6c50d24bb1ad862229

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

Android.mk

diff --git a/Android.mk b/Android.mk
index e2ed18b..06ac9e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,11 +64,11 @@
     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