From aa7dc685efb6ce80633b88d30f3b788a2c849452 Mon Sep 17 00:00:00 2001
From: Shinichiro Hamaji <hamaji@google.com>
Date: Thu, 7 Apr 2016 18:28:30 +0900
Subject: [PATCH] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index e2ed18b2a..06ac9e6a2 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