commit 6cedb6134fb7c4cc701912a919b25273cb46e10c
author Shinichiro Hamaji <hamaji@google.com> Fri Apr 15 04:34:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 15 04:34:38 2016 +0000
tree 50033c57a99469f3b438f92610b3e245f520b89c
parent 0a0a7cf815af48d589d480c03ad9277e41291dfb
parent aa7dc685efb6ce80633b88d30f3b788a2c849452

Let Messaging dex depend on proguard flag file
am: aa7dc68

* commit 'aa7dc685efb6ce80633b88d30f3b788a2c849452':
  Let Messaging dex depend on proguard flag file

Change-Id: I94d0d52cd46a8d77d00619b79d00fd21eea22982

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