Let Messaging dex depend on proguard flag file am: aa7dc68

am: 6cedb61

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

Change-Id: Iaeffaba197f17125803ad102416a89979350f69f
This commit is contained in:
Shinichiro Hamaji
2016-04-15 04:37:08 +00:00
committed by android-build-merger
+2 -2
View File
@@ -64,11 +64,11 @@ else
LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
endif endif
LOCAL_PROGUARD_FLAGS := -ignorewarnings -include build/core/proguard_basic_keeps.flags LOCAL_PROGUARD_FLAGS := -ignorewarnings
LOCAL_PROGUARD_ENABLED := nosystem 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)) ifeq (eng,$(TARGET_BUILD_VARIANT))
LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
else else