commit a7000c34911baf4ac9538765784074f00122ee70
author Ye Wen <ywen@google.com> Wed Jul 30 13:53:31 2014 -0700
committer Ye Wen <ywen@google.com> Wed Jul 30 13:53:31 2014 -0700
tree 36d0c92fb1fdc24ee4c7e3a8c4093de836689bb2
parent 2704c4bf1d52cb7a5d6d77c042b9448f38d3ca3c

Enable proguard

Change-Id: I5a9fb731633ced3aa415b95d44fe2995981c9a52

Android.mk

diff --git a/Android.mk b/Android.mk
index a75ece8..20d7357 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,9 +29,7 @@
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
-# TODO (ywen): Temporarily disabled. Turn it on before ship
-#LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true